From 75c7cb7aa808c7097f43c0acabeaec458dc1befc Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 14 Jan 2020 13:31:44 +0100 Subject: [PATCH] Keep circles for task page --- .../stylesheets/repository/repository_table.scss | 12 ++++++++++-- app/helpers/repository_datatable_helper.rb | 9 ++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/repository/repository_table.scss b/app/assets/stylesheets/repository/repository_table.scss index 5e2d4854d..6ade84096 100644 --- a/app/assets/stylesheets/repository/repository_table.scss +++ b/app/assets/stylesheets/repository/repository_table.scss @@ -65,6 +65,10 @@ background-color: $color-alto; } } + + .circle-icon { + margin-left: 30px; + } } // Checklists @@ -103,7 +107,9 @@ .repository-row-edit-icon { display: inline-block; } - .assign-counter-container { + + .assign-counter-container, + .circle-icon { margin-left: 0; } } @@ -121,7 +127,9 @@ .repository-row-edit-icon { display: none; } - .assign-counter-container { + + .assign-counter-container, + .circle-icon { margin-left: 30px; } } diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb index aabb4f4dd..c847d7b29 100644 --- a/app/helpers/repository_datatable_helper.rb +++ b/app/helpers/repository_datatable_helper.rb @@ -42,9 +42,16 @@ module RepositoryDatatableHelper end def assigned_row(record) - if record.assigned_my_modules_count.positive? + if @my_module + if record.assigned_my_modules_count.positive? + " " + else + " " + end + elsif record.assigned_my_modules_count.positive? tooltip = "#{record.assigned_my_modules_count} tasks, #{record.assigned_experiments_count} " \ "experiments, #{record.assigned_projects_count} projects" + "
"\ "#{record.assigned_my_modules_count}
" else