projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8784: Link directly to keep-web when sharing collections.
[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 0a2044a0e23e96b741d77658dfa91057fe57bdfa..2cd668a28dcb58e438b91c41e97b59dfb1117724 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-55,8
+55,10
@@
class ProjectsController < ApplicationController
pane_list = []
procs = ["arvados#containerRequest"]
pane_list = []
procs = ["arvados#containerRequest"]
+ procs_pane_name = 'Processes'
if PipelineInstance.api_exists?(:index)
procs << "arvados#pipelineInstance"
if PipelineInstance.api_exists?(:index)
procs << "arvados#pipelineInstance"
+ procs_pane_name = 'Pipelines_and_processes'
end
workflows = ["arvados#workflow"]
end
workflows = ["arvados#workflow"]
@@
-76,7
+78,7
@@
class ProjectsController < ApplicationController
}
pane_list <<
{
}
pane_list <<
{
- :name =>
'Pipelines_and_processes'
,
+ :name =>
procs_pane_name
,
:filters => [%w(uuid is_a) + [procs]]
}
pane_list <<
:filters => [%w(uuid is_a) + [procs]]
}
pane_list <<
@@
-147,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
@@
-159,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