From 43f571c154b5f11f45a6493ad8d2ce4cbbe5649f Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Tue, 16 May 2023 13:25:33 +0200
Subject: [PATCH] Enable Manage access for archived protocols [SCI-8453]
 (#5411)

---
 .../access_permissions/protocols_controller.rb         |  2 +-
 app/permissions/team.rb                                |  1 -
 app/views/protocols/index/_action_toolbar.html.erb     | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/controllers/access_permissions/protocols_controller.rb b/app/controllers/access_permissions/protocols_controller.rb
index 54de7353b..eed6c61e0 100644
--- a/app/controllers/access_permissions/protocols_controller.rb
+++ b/app/controllers/access_permissions/protocols_controller.rb
@@ -182,7 +182,7 @@ module AccessPermissions
     end
 
     def check_read_permissions
-      render_403 unless can_read_protocol_in_repository?(@protocol)
+      render_403 unless can_read_protocol_in_repository?(@protocol) || can_manage_team?(@protocol.team)
     end
 
     def log_activity(type_of, message_items = {})
diff --git a/app/permissions/team.rb b/app/permissions/team.rb
index 524b3ac5f..2a9df42d6 100644
--- a/app/permissions/team.rb
+++ b/app/permissions/team.rb
@@ -72,7 +72,6 @@ end
 Canaid::Permissions.register_for(Protocol) do
   %i(manage_protocol_in_repository
      manage_protocol_draft_in_repository
-     manage_protocol_users
      clone_protocol_in_repository
      publish_protocol_in_repository
      delete_protocol_draft_in_repository
diff --git a/app/views/protocols/index/_action_toolbar.html.erb b/app/views/protocols/index/_action_toolbar.html.erb
index d99a83c54..a5d4e7756 100644
--- a/app/views/protocols/index/_action_toolbar.html.erb
+++ b/app/views/protocols/index/_action_toolbar.html.erb
@@ -1,9 +1,13 @@
 <template id="protocolActionToolbar">
+  <button id="restoreProtocol" class="btn btn-light multiple-object-action hidden only-archive" data-url="<%= restore_protocols_path %>" data-for="restorable">
+    <i class="fas fa-undo"></i>
+    <span class="button-text"><%= t("protocols.index.action_toolbar.restore") %></span>
+  </button>
   <button id="protocolVersions" class="btn btn-light single-object-action hidden only-active" data-for="readable">
     <%= image_tag 'icon/versions.svg' %>
     <span class="button-text"><%= t("protocols.index.action_toolbar.versions") %></span>
   </button>
-  <button id="manageProtocolAccess" class="btn btn-light single-object-action hidden only-active">
+  <button id="manageProtocolAccess" class="btn btn-light single-object-action hidden">
     <i class="fas fa-door-open"></i>
     <span class="button-text"><%= t("protocols.index.action_toolbar.access") %></span>
   </button>
@@ -19,10 +23,6 @@
     <i class="fas fa-archive"></i>
     <span class="button-text"><%= t("protocols.index.action_toolbar.archive") %></span>
   </button>
-  <button id="restoreProtocol" class="btn btn-light multiple-object-action hidden only-archive" data-url="<%= restore_protocols_path %>" data-for="restorable">
-    <i class="fas fa-undo"></i>
-    <span class="button-text"><%= t("protocols.index.action_toolbar.restore") %></span>
-  </button>
   <div class="emptyPlaceholder hidden">
     <%= t("protocols.index.action_toolbar.empty_placeholder") %>
   </div>