From d00dc631f8a2570495eccdb9621a9d1cf405edf8 Mon Sep 17 00:00:00 2001 From: Naman Gupta <01namangupta@gmail.com> Date: Sat, 21 Oct 2017 02:42:08 +0530 Subject: [PATCH 1/4] Error opening link to difficulty level in Revision history is removed --- app/helpers/versions_helper.rb | 9 +++++++++ app/views/admin/versions/_object_desc_and_link.html.haml | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb index 5788fe9d..7827a5ef 100644 --- a/app/helpers/versions_helper.rb +++ b/app/helpers/versions_helper.rb @@ -162,4 +162,13 @@ 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 4852a50f..7e24d8c2 100644 --- a/app/views/admin/versions/_object_desc_and_link.html.haml +++ b/app/views/admin/versions/_object_desc_and_link.html.haml @@ -207,10 +207,7 @@ - when 'DifficultyLevel' difficulty level - - difficulty_level = current_or_last_object_state(version.item_type, version.item_id) - = link_if_alive version, difficulty_level.title, - admin_conference_program_difficulty_level_path(conference_short_title, version.item_id), - conference + = link_to_difficulty_level(version) - when 'Splashpage' = link_if_alive version, 'splashpage', 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 2/4] 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', From 0cd8d21611aa70edd6abfdf007ac2463a33cacaa Mon Sep 17 00:00:00 2001 From: Naman Gupta <01namangupta@gmail.com> Date: Sun, 22 Oct 2017 16:30:54 +0530 Subject: [PATCH 3/4] minor changes --- app/helpers/versions_helper.rb | 3 +-- .../admin/versions/_object_desc_and_link.html.haml | 11 ++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb index b1d6915d..1baca035 100644 --- a/app/helpers/versions_helper.rb +++ b/app/helpers/versions_helper.rb @@ -162,5 +162,4 @@ module VersionsHelper def users_role_change_description(version) version.event == 'create' ? 'added' : 'removed' end - -end +end \ No newline at end of file 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 ef791dd1..6b182c2f 100644 --- a/app/views/admin/versions/_object_desc_and_link.html.haml +++ b/app/views/admin/versions/_object_desc_and_link.html.haml @@ -207,15 +207,8 @@ - when 'DifficultyLevel' difficulty level - - 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 + - difficulty_level = current_or_last_object_state(version.item_type, version.item_id) + = link_if_alive version, difficulty_level.title,admin_conference_program_difficulty_levels_path(conference_short_title), conference - when 'Splashpage' = link_if_alive version, 'splashpage', From 77d8bfe49643bb593b6195843956bf2569b9b799 Mon Sep 17 00:00:00 2001 From: Naman Gupta <01namangupta@gmail.com> Date: Sun, 22 Oct 2017 17:02:17 +0530 Subject: [PATCH 4/4] styling failing error is corrected minor changes --- app/helpers/versions_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb index 1baca035..5788fe9d 100644 --- a/app/helpers/versions_helper.rb +++ b/app/helpers/versions_helper.rb @@ -162,4 +162,4 @@ module VersionsHelper def users_role_change_description(version) version.event == 'create' ? 'added' : 'removed' end -end \ No newline at end of file +end