gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display error if non existant conference's versions are queried

Browse source
This commit is contained in:
Nishanth Vijayan 2016-08-06 17:47:46 +05:30
parent 7cff5e0da6
commit 614da6003b
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/admin/versions_controller.rb
View file

@ -8,9 +8,12 @@ module Admin
@conference_id = params[:conference_id].to_i unless params[:conference_id].nil?
if @conference_id.nil?
@versions = PaperTrail::Version.where(["conference_id IN (?) OR item_type = 'User'", @conf_ids_for_organizer])
elsif !Conference.exists?(id: @conference_id)
redirect_to admin_revision_history_path, error: "Conference with ID #{@conference_id} does not exist!"
return
else
@versions = PaperTrail::Version.where(['conference_id IN (?)', (@conf_ids_for_organizer & [@conference_id])]).
where.not(item_type: 'User')
authorize! :index, PaperTrail::Version.new(conference_id: @conference_id)
@versions = PaperTrail::Version.where(conference_id: @conference_id)
end
end