From 21a3c113d14cee31783d308c90b441df83b9ccfc Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Tue, 13 May 2014 13:33:00 -0400 Subject: [PATCH] re-reveal the video code and listing code --- app/models/videolisting.rb | 13 ------------- app/views/campaigns/_form.html.erb | 2 +- app/views/campaigns/_videolisting_fields.html.erb | 3 +++ 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/app/models/videolisting.rb b/app/models/videolisting.rb index 0cc6012..5ac6601 100644 --- a/app/models/videolisting.rb +++ b/app/models/videolisting.rb @@ -5,10 +5,8 @@ class Videolisting < ActiveRecord::Base validates :videocode, presence: true, uniqueness: true validates :voiceoverselection, presence: true validates :musicselection, presence: true - after_create :fix_videocode after_save :send_notification_after_change after_initialize :set_defaults - before_validation :set_videocode def get_video_url "http://video2.bettervideo.com/video/pro/MP4640x360/720.#{videocode}.mp4" @@ -36,17 +34,6 @@ class Videolisting < ActiveRecord::Base end private - def set_videocode - self.videocode ||= SecureRandom.hex - end - - def fix_videocode - if self.campaign - self.videocode = "#{self.campaign.listingcode}-#{self.id}" - self.save - end - end - def set_defaults self.producttypeid = 721 end diff --git a/app/views/campaigns/_form.html.erb b/app/views/campaigns/_form.html.erb index 73d735d..078ac55 100644 --- a/app/views/campaigns/_form.html.erb +++ b/app/views/campaigns/_form.html.erb @@ -21,7 +21,7 @@ hint: "The name of the company." %> <%= frm.input :listingcode, label: 'Listing Code', - as: :hidden %> + hint: "Please provide the unique opportunity id." %> <%= frm.input :description, label: 'Description', as: 'text', diff --git a/app/views/campaigns/_videolisting_fields.html.erb b/app/views/campaigns/_videolisting_fields.html.erb index 79c0a70..dd8d107 100644 --- a/app/views/campaigns/_videolisting_fields.html.erb +++ b/app/views/campaigns/_videolisting_fields.html.erb @@ -1,4 +1,7 @@
+ <%= f.input :videocode, + label: 'Video Code', + hint: "Please provide the video code id." %> <%= f.input :voiceoverselection, label: 'Voiceover Selection', collection: voiceoverselection_list,