projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11807: Migrate old records in jobs table from YAML to JSON.
[arvados.git]
/
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 48b2c421fb08385e648d95ba8cac809e948eb7b8..2cd668a28dcb58e438b91c41e97b59dfb1117724 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-149,10
+149,9
@@
class ProjectsController < ApplicationController
link.destroy
end
link.destroy
end
- # If this object has the 'expires_at' attribute, then simply mark it
- # expired.
- if item.attributes.include?("expires_at")
- item.update_attributes expires_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
@removed_uuids << item.uuid
elsif item.owner_uuid == @object.uuid
# Object is owned by this project. Remove it from the project by
@@
-161,7
+160,7
@@
class ProjectsController < ApplicationController
item.update_attributes owner_uuid: current_user.uuid
@removed_uuids << item.uuid
rescue ArvadosApiClient::ApiErrorResponseException => e
item.update_attributes owner_uuid: current_user.uuid
@removed_uuids << item.uuid
rescue ArvadosApiClient::ApiErrorResponseException => e
- if e.message.include? '_owner_uuid_
name_unique
'
+ if e.message.include? '_owner_uuid_'
rename_to = item.name + ' removed from ' +
(@object.name ? @object.name : @object.uuid) +
' at ' + Time.now.to_s
rename_to = item.name + ' removed from ' +
(@object.name ? @object.name : @object.uuid) +
' at ' + Time.now.to_s