diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index 1f8eb566..1d9c4e79 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -51,7 +51,9 @@ module Admin @difficulty_levels = @program.difficulty_levels @versions = @event.versions | PaperTrail::Version.where(item_type: 'Commercial').where_object(commercialable_id: @event.id, commercialable_type: 'Event') | - PaperTrail::Version.where(item_type: 'Commercial').where_object_changes(commercialable_id: @event.id, commercialable_type: 'Event') + PaperTrail::Version.where(item_type: 'Commercial').where_object_changes(commercialable_id: @event.id, commercialable_type: 'Event') | + PaperTrail::Version.where(item_type: 'Vote').where('object_changes LIKE ?', "%\nevent_id:\n- \n- #{@event.id}\n%") | + PaperTrail::Version.where(item_type: 'Vote').where('object LIKE ?', "%\nevent_id: #{@event.id}\n%") end def edit diff --git a/app/models/ability.rb b/app/models/ability.rb index 09d73da9..ce047a1b 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -215,6 +215,7 @@ class Ability 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, item_type: 'Vote', 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')) diff --git a/app/views/admin/events/show.html.haml b/app/views/admin/events/show.html.haml index d961f483..d7624f82 100644 --- a/app/views/admin/events/show.html.haml +++ b/app/views/admin/events/show.html.haml @@ -34,6 +34,10 @@ = event_change_description(version) = "event #{@event.title}" + - elsif version.item_type == 'Vote' + = vote_change_description(version) + = "event #{@event.title}" + - else = general_change_description(version) = link_to 'commercial',