diff --git a/app/models/campaign.rb b/app/models/campaign.rb index 4d7183b..95512e0 100644 --- a/app/models/campaign.rb +++ b/app/models/campaign.rb @@ -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 diff --git a/app/models/user.rb b/app/models/user.rb index c1e5d36..a724dcd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 diff --git a/app/models/videolisting.rb b/app/models/videolisting.rb index 3293286..14289ca 100644 --- a/app/models/videolisting.rb +++ b/app/models/videolisting.rb @@ -1,4 +1,6 @@ class Videolisting < ActiveRecord::Base belongs_to :campaign validates :videocode, presence: true, uniqueness: true + validates :producttypeid, presence: true + end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 15cb963..b367168 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,19 +1,6 @@ - \ No newline at end of file +<% if user_signed_in? %> + <%= link_to "Profile", edit_user_registration_path %> + <%= link_to "Logout", destroy_user_session_path, :method => :delete %> +<% else %> + <%= link_to "Sign in", new_user_session_path %> +<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c298e43..8bbe6d1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,8 +10,6 @@ <%= render 'layouts/header' %> <%= render 'flashes' -%> -

<%= notice %>

-

<%= alert %>