From 15813f9be642bcdd6e8a1de5c7735952ff0d294f Mon Sep 17 00:00:00 2001 From: Naman Gupta <01namangupta@gmail.com> Date: Sun, 22 Oct 2017 13:09:43 +0530 Subject: [PATCH] difficulty level code redundancy is removed --- app/helpers/versions_helper.rb | 10 +--------- .../admin/versions/_object_desc_and_link.html.haml | 10 +++++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb index 7827a5ef..b1d6915d 100644 --- a/app/helpers/versions_helper.rb +++ b/app/helpers/versions_helper.rb @@ -162,13 +162,5 @@ module VersionsHelper def users_role_change_description(version) version.event == 'create' ? 'added' : 'removed' end - - - def link_to_difficulty_level(version) - return 'deleted role' if version.conference_id.nil? - conference = Conference.find_by(id: version.conference_id) - difficulty_level = DifficultyLevel.find(version.item_id) - link_to difficulty_level.title, - admin_conference_program_difficulty_levels_path(conference.short_title) - end + end 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 7e24d8c2..ef791dd1 100644 --- a/app/views/admin/versions/_object_desc_and_link.html.haml +++ b/app/views/admin/versions/_object_desc_and_link.html.haml @@ -207,7 +207,15 @@ - when 'DifficultyLevel' difficulty level - = link_to_difficulty_level(version) + - difficulty_level = DifficultyLevel.find_by(id: version.item_id) + - if difficulty_level.nil? + = 'Difficulty Level Deleted' + - else + - conference = Conference.find_by(id: version.conference_id) + - unless conference.nil? + = link_to difficulty_level.title, admin_conference_program_difficulty_levels_path(conference.short_title) + - else + = difficulty_level.title - when 'Splashpage' = link_if_alive version, 'splashpage',