9426: delete all tags

Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika@curoverse.com>

diff --git a/apps/workbench/app/assets/javascripts/edit_collection_tags.js b/apps/workbench/app/assets/javascripts/edit_collection_tags.js
index 8dc9d6138f2399dc162de07a9d966998d89b74b1..06cd64b00a0fdf3183fdcf5f309fc87d0304ac63 100644 (file)
--- a/apps/workbench/app/assets/javascripts/edit_collection_tags.js
+++ b/apps/workbench/app/assets/javascripts/edit_collection_tags.js
@@ -31,9 +31,15 @@ $(document).
         }
       });
 
+      if(jQuery.isEmptyObject(tag_data)){
+        tag_data["empty"]=true
+      } else {
+        tag_data = {tag_data}
+      }
+
       $.ajax($(location).attr('pathname')+'/save_tags', {
           type: 'POST',
-          data: {tag_data}
+          data: tag_data
       }).success(function(data, status, jqxhr) {
         $('.collection-tags-status').append('<div class="collection-tags-status-label alert alert-success"><p class="contain-align-left">Saved successfully.</p></div>');
       }).fail(function(jqxhr, status, error) {
@@ -42,7 +48,7 @@ $(document).
     }).
     on('click', '.collection-tag-cancel', function(e){
       $.ajax($(location).attr('pathname')+'/tags', {
-          type: 'POST'
+          type: 'GET'
       });
     });
 

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 8e1e8a5b521c8e6bb748840f39d9ad66b653b0f7..bfba2f57f8616facadc818e3d4c016d8206d92c0 100644 (file)
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -350,9 +350,16 @@ class CollectionsController < ApplicationController
   end
 
   def save_tags
+    tags = nil
     if params['tag_data']
+      tags = params['tag_data']
+    elsif params['empty']
+      tags = {}
+    end
+
+    if tags
       props = @object.properties
-      props[:tags] = params['tag_data']
+      props[:tags] = tags
 
       if @object.update_attributes properties: props
       else

diff --git a/apps/workbench/app/views/collections/_show_tags.html.erb b/apps/workbench/app/views/collections/_show_tags.html.erb
index 54c9c5c34190bcc22e2c8302cc6f56c147fba72e..4ffe7ff5f9755effe734623817be1afa3a120470 100644 (file)
--- a/apps/workbench/app/views/collections/_show_tags.html.erb
+++ b/apps/workbench/app/views/collections/_show_tags.html.erb
@@ -37,7 +37,7 @@
           <%= link_to(save_tags_collection_path, {class: 'btn btn-sm btn-primary collection-tag-save hide', :remote => true, method: 'post', return_to: request.url}) do %>
             Save
           <% end %>
-          <%= link_to(tags_collection_path, {class: 'btn btn-sm btn-primary collection-tag-cancel hide', :remote => true, method: 'post', return_to: request.url}) do %>
+          <%= link_to(tags_collection_path, {class: 'btn btn-sm btn-primary collection-tag-cancel hide', :remote => true, method: 'get', return_to: request.url}) do %>
             Cancel
           <% end %>
         </div>

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 5bd484956f7627ab962394f9cd5eb169d3649ded..bf7118f701f0071754ee8ee919436df02e4c1164 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -88,7 +88,7 @@ ArvadosWorkbench::Application.routes.draw do
     post 'unshare', :on => :member
     get 'choose', on: :collection
     post 'remove_selected_files', on: :member
-    post 'tags', on: :member
+    get 'tags', on: :member
     post 'save_tags', on: :member
   end
   get('/collections/download/:uuid/:reader_token/*file' => 'collections#show_file',