From bba1165c7b19e2db4ebd1c30c9f7a62421e07090 Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Tue, 19 Jan 2021 11:22:53 +0100 Subject: [PATCH] Fix edit button for folder in archive mode [SCI-5418] (#3096) * Fix edit button for folder in archive mode [SCI-5418] * Remove archive folder from routes [SCI-5418] --- app/views/projects/index/_folder_card.html.erb | 4 ++-- app/views/projects/index/_toolbar.html.erb | 2 +- config/routes.rb | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/views/projects/index/_folder_card.html.erb b/app/views/projects/index/_folder_card.html.erb index b95a75bc1..33c05a031 100644 --- a/app/views/projects/index/_folder_card.html.erb +++ b/app/views/projects/index/_folder_card.html.erb @@ -3,8 +3,8 @@ data-edit-url="<%= edit_project_folder_path(folder) %>" data-editable="<%= can_update_team?(current_team) %>" data-moveable="<%= can_update_team?(current_team) %>" - data-archivable="<%= folder.active? && can_update_team?(current_team) %>" - data-restorable="<%= folder.archived? && can_update_team?(current_team) %>"> + data-archivable="false" + data-restorable="false">
diff --git a/app/views/projects/index/_toolbar.html.erb b/app/views/projects/index/_toolbar.html.erb index 74a7368ea..4ace2cb76 100644 --- a/app/views/projects/index/_toolbar.html.erb +++ b/app/views/projects/index/_toolbar.html.erb @@ -20,7 +20,7 @@ <% end %> <% end %> - diff --git a/config/routes.rb b/config/routes.rb index 0dc80ad3f..8f2d9f7f7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -302,9 +302,6 @@ Rails.application.routes.draw do end resources :project_folders, only: %i(create new update edit) do - member do - post 'archive', to: 'project_folders#archive' - end get 'cards', to: 'projects#cards' collection do