projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20984-instance-capacity'
[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 66dc3dcea2d418b2bbd79e6907d37fac4cbc0fbb..53a6d80446b7d1d0040732595e6882389bc42ef8 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-133,7
+133,7
@@
class ProjectsController < ApplicationController
def remove_items
@removed_uuids = []
params[:item_uuids].collect { |uuid| ArvadosBase.find uuid }.each do |item|
def remove_items
@removed_uuids = []
params[:item_uuids].collect { |uuid| ArvadosBase.find uuid }.each do |item|
- if item.class == Collection or item.class == Group
+ if item.class == Collection or item.class == Group
or item.class == Workflow or item.class == ContainerRequest
# Use delete API on collections and projects/groups
item.destroy
@removed_uuids << item.uuid
# Use delete API on collections and projects/groups
item.destroy
@removed_uuids << item.uuid
@@
-141,7
+141,7
@@
class ProjectsController < ApplicationController
# Object is owned by this project. Remove it from the project by
# changing owner to the current user.
begin
# Object is owned by this project. Remove it from the project by
# changing owner to the current user.
begin
- item.update
_attributes
owner_uuid: current_user.uuid
+ item.update owner_uuid: current_user.uuid
@removed_uuids << item.uuid
rescue ArvadosApiClient::ApiErrorResponseException => e
if e.message.include? '_owner_uuid_'
@removed_uuids << item.uuid
rescue ArvadosApiClient::ApiErrorResponseException => e
if e.message.include? '_owner_uuid_'
@@
-151,7
+151,7
@@
class ProjectsController < ApplicationController
updates = {}
updates[:name] = rename_to
updates[:owner_uuid] = current_user.uuid
updates = {}
updates[:name] = rename_to
updates[:owner_uuid] = current_user.uuid
- item.update
_attributes
updates
+ item.update updates
@removed_uuids << item.uuid
else
raise
@removed_uuids << item.uuid
else
raise
@@
-170,7
+170,7
@@
class ProjectsController < ApplicationController
end
while (objects = @object.contents).any?
objects.each do |object|
end
while (objects = @object.contents).any?
objects.each do |object|
- object.update
_attributes
! owner_uuid: current_user.uuid
+ object.update! owner_uuid: current_user.uuid
end
end
if ArvadosBase::resource_class_for_uuid(@object.owner_uuid) == Group
end
end
if ArvadosBase::resource_class_for_uuid(@object.owner_uuid) == Group