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

Merge pull request #1128 from nishanthvijayan/event-changelog

Browse source 
Improve event history page
This commit is contained in:
Stella Rouzi 2016-08-16 18:23:56 +03:00 • committed by GitHub
commit 99992750bb
8 changed files with 69 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/ability.rb
View file

@ -210,6 +210,12 @@ class Ability
role.resource_type == 'Conference' && role.name == 'cfp' &&
(Conference.with_role(:cfp, user).pluck(:id).include? role.resource_id)
end
can [:index, :revert_object, :revert_attribute], PaperTrail::Version, item_type: 'Event', conference_id: conf_ids_for_cfp
can [:index, :revert_object, :revert_attribute], PaperTrail::Version do |version|
version.item_type == 'Commercial' && conf_ids_for_cfp.include?(version.conference_id) &&
(version.object.to_s.include?('Event') || version.object_changes.to_s.include?('Event'))
end
end
def signed_in_with_info_desk_role(user)