From 50c78f182ce2ecad370b8e6ef9c7bd7ecabe2158 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Fri, 23 Aug 2019 11:13:58 +0200 Subject: [PATCH 1/4] Add a team name to inventory item card --- app/assets/stylesheets/repositories.scss | 6 ++++++ .../_repository_row_info_modal.html.erb | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss index 2f5e0a2b1..1f0998246 100644 --- a/app/assets/stylesheets/repositories.scss +++ b/app/assets/stylesheets/repositories.scss @@ -205,3 +205,9 @@ } } } + +#repository_row-info-table { + .fas { + color: $color-silver-chalice; + } +} diff --git a/app/views/repositories/_repository_row_info_modal.html.erb b/app/views/repositories/_repository_row_info_modal.html.erb index b74cf93a7..8d132dfec 100644 --- a/app/views/repositories/_repository_row_info_modal.html.erb +++ b/app/views/repositories/_repository_row_info_modal.html.erb @@ -50,15 +50,23 @@
    -
  1.   +
  2. +   + <%= render partial: "search/results/partials/team_text.html.erb", + locals: { team: element.my_module.experiment.project.team } %> +
    3. +
  3. + <%= image_tag 'icon_small/project.svg' %> <%= render partial: 'search/results/partials/project_text.html.erb', locals: { project: element.my_module.experiment.project } %>
    4. -
  4.   +
  5. + <%= image_tag 'icon_small/experiment.svg' %> <%= render partial: 'search/results/partials/experiment_text.html.erb', locals: { experiment: element.my_module.experiment } %>
    6. -
  6.   +
  7. + <%= image_tag 'icon_small/task.svg' %> <%= render partial: 'search/results/partials/my_module_text.html.erb', locals: { my_module: element.my_module, link_to_page: :repositories, From 5bf3a5d418647dbb1f7af02574a0ff81fee52ee3 Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Mon, 26 Aug 2019 09:36:41 +0200 Subject: [PATCH 2/4] Fix sharing check in service [SCI-3798] (#2011) * Update shared inventory permissions * Fix tests and simplify condition for placeholder * Fix sharing check in service * Fix rebase conflicts --- app/services/repositories/multiple_share_update_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/repositories/multiple_share_update_service.rb b/app/services/repositories/multiple_share_update_service.rb index 4febdaf2f..c691bf9ed 100644 --- a/app/services/repositories/multiple_share_update_service.rb +++ b/app/services/repositories/multiple_share_update_service.rb @@ -98,7 +98,7 @@ module Repositories return false end - if can_manage_repository?(@user, @repository) + if can_share_repository?(@user, @repository) true else @errors[:user_without_permissions] = From b3e3c443f052553f29073f8e83b1e700392cf103 Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Mon, 26 Aug 2019 11:20:03 +0200 Subject: [PATCH 3/4] Fix big gap in title of navbar (#2015) --- app/assets/stylesheets/themes/scinote.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index b2d423695..491a2177a 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -322,6 +322,7 @@ a[data-toggle="tooltip"] { .nav-name { height: 54px; line-height: 44px; + margin: 0; overflow: hidden; padding: 5px 0; text-overflow: ellipsis; From 66326d90e54eba7369c074c3c6e5e3c248ba2851 Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Mon, 26 Aug 2019 11:24:22 +0200 Subject: [PATCH 4/4] Fix shared icon show/hidden (#2014) --- app/assets/javascripts/repositories/index.js | 4 +++- app/views/repositories/_sidebar.html.erb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/repositories/index.js b/app/assets/javascripts/repositories/index.js index 8bfeb2e1c..288f0bb8a 100644 --- a/app/assets/javascripts/repositories/index.js +++ b/app/assets/javascripts/repositories/index.js @@ -145,7 +145,9 @@ if (data.warnings) { alert(data.warnings); } - $('.repository-share-status').toggleClass('hidden', !data.status); + $(`#slide-panel li.active .repository-share-status, + #repository-toolbar .repository-share-status + `).toggleClass('hidden', !data.status); $('.share-repo-modal').modal('hide'); }, error: function(data) { diff --git a/app/views/repositories/_sidebar.html.erb b/app/views/repositories/_sidebar.html.erb index d419baece..8dd7bf380 100644 --- a/app/views/repositories/_sidebar.html.erb +++ b/app/views/repositories/_sidebar.html.erb @@ -31,7 +31,7 @@ <%= draw_custom_icon('shared-read') %> <% end %> <% else %> - " > + " > <%= draw_custom_icon('i-shared') %> <% end %>