c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

fix channel video_id validation when updating

Browse Source
This commit is contained in:
Lee Lawlor
2015-02-13 11:07:18 -05:00
parent 167f1ea6ae
commit c0bc92b7e2
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/channels_controller.rb
View File

@ -202,7 +202,8 @@ class ChannelsController < ApplicationController
@channel.assign_attributes(channel_params)
if !@channel.valid?
flash[:alert] = @channel.errors.full_messages.join(', ')
@channel.errors.add(:base, t(:channel_video_type_blank))
flash[:alert] = @channel.errors.full_messages.join('. ')
redirect_to channel_path(@channel.id, :anchor => "channelsettings") and return
end

2
app/models/channel.rb
View File

@ -76,7 +76,7 @@ class Channel < ActiveRecord::Base
before_destroy :delete_feeds
validates :video_type, :presence => { :message => I18n.t(:channel_video_type_blank) }, :if => lambda{ |channel| channel.video_id.present? }
validates :video_type, :presence => true, :if => lambda{ |channel| channel.video_id.present? }
scope :public_viewable, lambda { where("public_flag = true AND social != true") }
scope :not_social, lambda { where("social != true") }