From 02717e4b0875ac5dd204bad1ca034e5814dc237d Mon Sep 17 00:00:00 2001 From: radhika Date: Tue, 20 Jun 2017 13:54:03 -0400 Subject: [PATCH] 9426: delete all tags Arvados-DCO-1.1-Signed-off-by: Radhika Chippada --- .../app/assets/javascripts/edit_collection_tags.js | 8 +++++++- apps/workbench/app/controllers/collections_controller.rb | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/apps/workbench/app/assets/javascripts/edit_collection_tags.js b/apps/workbench/app/assets/javascripts/edit_collection_tags.js index 8dc9d6138f..9a7ebece70 100644 --- 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('

Saved successfully.

'); }).fail(function(jqxhr, status, error) { diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb index 8e1e8a5b52..bfba2f57f8 100644 --- 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 -- 2.30.2