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

fix versions?

Browse source
This commit is contained in:
Michael Ball 2020-08-02 14:26:44 -07:00
parent 0cca2dc619
commit 6186eee1d5
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/versions_helper.rb
View file

@ -75,7 +75,7 @@ module VersionsHelper
registration_id = current_or_last_object_state(version.item_type, version.item_id).registration_id
user_id = current_or_last_object_state('Registration', registration_id).user_id
end
user_name = User.find_by(id: user_id).try(:name) || current_or_last_object_state('User', user_id).try(:name) || PaperTrail::Version.where(item_type: 'User', item_id: user_id).last&.changeset[:name].second
user_name = User.find_by(id: user_id).try(:name) || current_or_last_object_state('User', user_id).try(:name) || (PaperTrail::Version.where(item_type: 'User', item_id: user_id).last&.changeset || {})[:name]&.second
if user_id.to_s == version.whodunnit
case version.event

5
app/views/admin/versions/_object_desc_and_link.html.haml
View file

@ -75,8 +75,9 @@
= link_to (current_or_last_object_state('Event', object.event_id).try(:title) || 'deleted'),
admin_conference_program_event_path(conference_short_title, object.event_id)
in
= link_to "Schedule #{version.item.schedule_id}",
admin_conference_schedule_path(conference_short_title, version.item.schedule_id)
- if version.item
= link_to "Schedule #{version.item&.schedule_id}",
admin_conference_schedule_path(conference_short_title, version.item&.schedule_id)
- when 'Schedule'
= link_if_alive version, "Schedule #{version.item_id}",