tyrel/vidpush
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add requirements, update headers, presence and uniqueness true.

Browse Source
This commit is contained in:
Tyrel Souza 2014-04-08 17:42:43 -04:00
parent ab906fdd00
commit 3410022799
5 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/campaign.rb
View File

@ -2,4 +2,8 @@ class Campaign < ActiveRecord::Base
has_many :videolistings
accepts_nested_attributes_for :videolistings
validates :clientid, presence: true, uniqueness: true
validates :billingcode, uniqueness: true
validates :listingcode, presence: true, uniqueness: true
validates :advertisername, presence: true
validates :websiteurl, presence: true
end

2
app/models/user.rb
View File

@ -1,7 +1,7 @@
class User < ActiveRecord::Base
# Include default devise modules. Others available are:
# :confirmable, :lockable, :timeoutable and :omniauthable
before_save :ensure_authentication_token
# before_save :ensure_authentication_token
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable

2
app/models/videolisting.rb
View File

@ -1,4 +1,6 @@
class Videolisting < ActiveRecord::Base
belongs_to :campaign
validates :videocode, presence: true, uniqueness: true
validates :producttypeid, presence: true
end

23
app/views/layouts/_header.html.erb
View File

@ -1,19 +1,6 @@
<ul class="nav pull-right">
<% if user_signed_in? %>
<li id="fat-menu" class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Account <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><%= link_to "Profile", edit_user_registration_path %></li>
<li><%= link_to "Settings", '#' %></li>
<li>
<% if user_signed_in? %>
<%= link_to "Profile", edit_user_registration_path %>
<%= link_to "Logout", destroy_user_session_path, :method => :delete %>
</li>
</ul>
</li>
<li> <%= link_to "Logout", destroy_user_session_path, :method => :delete %></li>
<% else %>
<li><%= link_to "Sign in", new_user_session_path %></li>
<% end %>
</ul>
<% else %>
<%= link_to "Sign in", new_user_session_path %>
<% end %>

2
app/views/layouts/application.html.erb
View File

@ -10,8 +10,6 @@
<body class="<%= body_class %>">
<%= render 'layouts/header' %>
<%= render 'flashes' -%>
<p class="notice"><%= notice %></p>
<p class="alert"><%= alert %></p>
<div class="row">
<div class="small-12 medium-12 large-12 columns">