gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues 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

3
app/controllers/admin/events_controller.rb
View file

@ -86,6 +86,9 @@ module Admin
@comment_count = @event.comment_threads.count
@ratings = @event.votes.includes(:user)
@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')
end
def edit

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

@ -29,7 +29,7 @@ module Admin
flash[:error] = 'Revert failed. Attribute missing or invalid'
end
redirect_to admin_revision_history_path
redirect_back_or_to admin_revision_history_path
end
def revert_object
@ -52,7 +52,7 @@ module Admin
flash[:error] = 'The item is already in the state that you are trying to revert it back to'
end
redirect_to admin_revision_history_path
redirect_back_or_to admin_revision_history_path
end
end
end