From 6186eee1d5765628ffe36de9ff2106340be8baf7 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Sun, 2 Aug 2020 14:26:44 -0700 Subject: [PATCH] fix versions? --- app/helpers/versions_helper.rb | 2 +- app/views/admin/versions/_object_desc_and_link.html.haml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb index 37cdc3b5..1e760ce4 100644 --- a/app/helpers/versions_helper.rb +++ b/app/helpers/versions_helper.rb @@ -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 diff --git a/app/views/admin/versions/_object_desc_and_link.html.haml b/app/views/admin/versions/_object_desc_and_link.html.haml index be9f4741..6870af95 100644 --- a/app/views/admin/versions/_object_desc_and_link.html.haml +++ b/app/views/admin/versions/_object_desc_and_link.html.haml @@ -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}",