From fc29641c2b3563f940c9bbbc643ef1b25c586eb4 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Fri, 17 Jan 2020 17:28:08 +0100 Subject: [PATCH] Hide manage column action buttons on Task page --- app/assets/stylesheets/repository_columns/index.scss | 10 ++++++++++ app/views/my_modules/repository.html.erb | 2 +- app/views/repositories/show.html.erb | 2 +- .../repository_columns/_manage_column_modal.html.erb | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/repository_columns/index.scss b/app/assets/stylesheets/repository_columns/index.scss index b498e8bdf..77e5293a6 100644 --- a/app/assets/stylesheets/repository_columns/index.scss +++ b/app/assets/stylesheets/repository_columns/index.scss @@ -180,4 +180,14 @@ float: left; margin-left: 5px; } + + &[data-task-page=true] { + .repo-columns-list>.editable:hover>.manage-controls { + display: none; + } + + .repo-columns-list>.editable:hover>.column-type { + display: inline-block; + } + } } diff --git a/app/views/my_modules/repository.html.erb b/app/views/my_modules/repository.html.erb index e4413cec9..30bfea523 100644 --- a/app/views/my_modules/repository.html.erb +++ b/app/views/my_modules/repository.html.erb @@ -56,7 +56,7 @@ -<%= render partial: 'repository_columns/manage_column_modal.html.erb' %> +<%= render partial: 'repository_columns/manage_column_modal.html.erb', locals: { my_module_page: true } %> <%= stylesheet_link_tag 'datatables' %> <%= javascript_include_tag 'repositories/repository_datatable' %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 8caf7cf0d..b50a438d1 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -174,7 +174,7 @@ <%= render partial: 'repositories/export_repository_modal.html.erb', locals: { repository: @repository } %> -<%= render partial: 'repository_columns/manage_column_modal.html.erb' %> +<%= render partial: 'repository_columns/manage_column_modal.html.erb', locals: { my_module_page: false } %> <%= javascript_include_tag 'repositories/edit' %> <%= javascript_include_tag 'repositories/repository_datatable' %> diff --git a/app/views/repository_columns/_manage_column_modal.html.erb b/app/views/repository_columns/_manage_column_modal.html.erb index 8e8fed897..84a3dc205 100644 --- a/app/views/repository_columns/_manage_column_modal.html.erb +++ b/app/views/repository_columns/_manage_column_modal.html.erb @@ -2,7 +2,7 @@ id="manage-repository-column" tabindex="-1" role="dialog" - aria-labelledby="manangeRepositoryColumnLabel"> + aria-labelledby="manangeRepositoryColumnLabel" data-task-page="<%= my_module_page ? 'true' : '' %>">