From d10dedb6f164cf3c6e126b8e96793fe8356db24e Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:27:24 +0300 Subject: [PATCH 1/9] settings.yml add show_tags_after_queries --- config/settings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/settings.yml b/config/settings.yml index e9eb9c7..17287de 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -1,6 +1,7 @@ active_issue_tags: '0' active_wiki_tags: '0' open_issues_only: '0' +show_tags_after_queries: '0' show_with_count: '0' tags_color_theme: '1' tags_sidebar: 'none' From f1cf335207b1b79e4646694d1fbb3c27961268af Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:29:06 +0300 Subject: [PATCH 2/9] en.yml add label for show_tags_after_queries setting --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9509092..a81d7a5 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -15,6 +15,7 @@ en: label_manage_tags: "Manage tags" label_merge_selected_tags: "Merge selected tags" label_open_issues_only: "Display open issues only" + label_show_tags_after_queries: "Show tags after queries" label_show_with_count: "Display amount on tag" label_tag_color_theme: Color theme %{value} label_tags_color_theme: Color From f1ef3a167f0378589950112452899a7cddde43c6 Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:30:04 +0300 Subject: [PATCH 3/9] add _tags_sidebar_after.html.slim --- app/views/issues/_tags_sidebar_after.html.slim | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/views/issues/_tags_sidebar_after.html.slim diff --git a/app/views/issues/_tags_sidebar_after.html.slim b/app/views/issues/_tags_sidebar_after.html.slim new file mode 100644 index 0000000..7512368 --- /dev/null +++ b/app/views/issues/_tags_sidebar_after.html.slim @@ -0,0 +1,2 @@ +- if AdditionalTags.setting?(:show_tags_after_queries) + == render 'tags_sidebar' From d348bebdc02d5ea01f473389558501056d23a027 Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:30:30 +0300 Subject: [PATCH 4/9] add _tags_sidebar_before.html.slim --- app/views/issues/_tags_sidebar_before.html.slim | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/views/issues/_tags_sidebar_before.html.slim diff --git a/app/views/issues/_tags_sidebar_before.html.slim b/app/views/issues/_tags_sidebar_before.html.slim new file mode 100644 index 0000000..cd90db4 --- /dev/null +++ b/app/views/issues/_tags_sidebar_before.html.slim @@ -0,0 +1,2 @@ +- unless AdditionalTags.setting?(:show_tags_after_queries) + == render 'tags_sidebar' From 676ff60f64ca538163e03089e24841f9393aeedb Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:32:01 +0300 Subject: [PATCH 5/9] _general.html.slim add option for show_tags_after_queries --- app/views/additional_tags/settings/_general.html.slim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/additional_tags/settings/_general.html.slim b/app/views/additional_tags/settings/_general.html.slim index 92e4a6b..4c764e8 100644 --- a/app/views/additional_tags/settings/_general.html.slim +++ b/app/views/additional_tags/settings/_general.html.slim @@ -9,6 +9,9 @@ fieldset.settings p = additionals_settings_checkbox :show_with_count + p + = additionals_settings_checkbox :show_tags_after_queries + p = additionals_settings_select :tags_sort_by, options_for_select(%w[name count].collect { |v| [l("tags_sort_by_#{v}"), v] }, From d16099e50248125104e11cc742f9ee154f6ef621 Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:35:39 +0300 Subject: [PATCH 6/9] view_hook.rb add tags_sidebar in view_issues_sidebar_queries_bottom --- lib/additional_tags/hooks/view_hook.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/additional_tags/hooks/view_hook.rb b/lib/additional_tags/hooks/view_hook.rb index b432071..d74c6e6 100644 --- a/lib/additional_tags/hooks/view_hook.rb +++ b/lib/additional_tags/hooks/view_hook.rb @@ -11,7 +11,8 @@ class ViewHook < Redmine::Hook::ViewListener partial: 'issues/tags_form_details', locals: { tags_form: 'issues/tags_form' } render_on :view_issues_show_details_bottom, partial: 'issues/tags' - render_on :view_issues_sidebar_planning_bottom, partial: 'issues/tags_sidebar' + render_on :view_issues_sidebar_planning_bottom, partial: 'issues/tags_sidebar_before' + render_on :view_issues_sidebar_queries_bottom, partial: 'issues/tags_sidebar_after' render_on :view_layouts_base_html_head, partial: 'additional_tags/html_head' render_on :view_layouts_base_body_bottom, partial: 'additional_tags/body_bottom' render_on :view_wiki_form_bottom, partial: 'tags_form_bottom' From aeb4e0915259c5b5bea238a25fafb2f408c9c269 Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:40:50 +0300 Subject: [PATCH 7/9] _tags_sidebar_after.html.slim fix RuboCop --- app/views/issues/_tags_sidebar_after.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/_tags_sidebar_after.html.slim b/app/views/issues/_tags_sidebar_after.html.slim index 7512368..5f81e1d 100644 --- a/app/views/issues/_tags_sidebar_after.html.slim +++ b/app/views/issues/_tags_sidebar_after.html.slim @@ -1,2 +1,2 @@ -- if AdditionalTags.setting?(:show_tags_after_queries) +- if AdditionalTags.setting? :show_tags_after_queries == render 'tags_sidebar' From 944b7d9b5f1b87f30648bd13002a5501cb01dbe1 Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:41:10 +0300 Subject: [PATCH 8/9] _tags_sidebar_before.html.slim fix RuboCop --- app/views/issues/_tags_sidebar_before.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/_tags_sidebar_before.html.slim b/app/views/issues/_tags_sidebar_before.html.slim index cd90db4..514cb3f 100644 --- a/app/views/issues/_tags_sidebar_before.html.slim +++ b/app/views/issues/_tags_sidebar_before.html.slim @@ -1,2 +1,2 @@ -- unless AdditionalTags.setting?(:show_tags_after_queries) +- unless AdditionalTags.setting? :show_tags_after_queries == render 'tags_sidebar' From 1058786012fc799c8d841b0256b2bd0508068a84 Mon Sep 17 00:00:00 2001 From: long76 <18124433+long76@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:20:51 +0300 Subject: [PATCH 9/9] _general.html.slim checkbox in right place --- app/views/additional_tags/settings/_general.html.slim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/additional_tags/settings/_general.html.slim b/app/views/additional_tags/settings/_general.html.slim index 4c764e8..bac0b28 100644 --- a/app/views/additional_tags/settings/_general.html.slim +++ b/app/views/additional_tags/settings/_general.html.slim @@ -9,9 +9,6 @@ fieldset.settings p = additionals_settings_checkbox :show_with_count - p - = additionals_settings_checkbox :show_tags_after_queries - p = additionals_settings_select :tags_sort_by, options_for_select(%w[name count].collect { |v| [l("tags_sort_by_#{v}"), v] }, @@ -40,6 +37,9 @@ fieldset.settings p = additionals_settings_checkbox :active_issue_tags + p + = additionals_settings_checkbox :show_tags_after_queries + p = additionals_settings_checkbox :open_issues_only