X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4c76ae6b65612579e465a2862f3c2bdfea06b43a..0561bd0c3c07257fd58ded6c7cfa5feeae97af57:/apps/workbench/app/controllers/projects_controller.rb diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb index 273f9d0c80..c010123ea0 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class ProjectsController < ApplicationController before_filter :set_share_links, if: -> { defined? @object and @object} skip_around_filter :require_thread_api_token, if: proc { |ctrl| @@ -149,10 +153,9 @@ class ProjectsController < ApplicationController link.destroy end - # If this object has the 'trash_at' attribute, then simply mark it - # as trash. - if item.attributes.include?("trash_at") - item.update_attributes trash_at: Time.now + if item.class == Collection + # Use delete API on collections + item.destroy @removed_uuids << item.uuid elsif item.owner_uuid == @object.uuid # Object is owned by this project. Remove it from the project by