projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19166: Merge branch 'main'
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
actions_controller.rb
diff --git
a/apps/workbench/app/controllers/actions_controller.rb
b/apps/workbench/app/controllers/actions_controller.rb
index 376465ee12e09f3c6337416bfc363b0ae9e0fa18..df489d2eebc997c9efc8f3c55236f46021657fd4 100644
(file)
--- a/
apps/workbench/app/controllers/actions_controller.rb
+++ b/
apps/workbench/app/controllers/actions_controller.rb
@@
-34,7
+34,7
@@
class ActionsController < ApplicationController
@object.link_class == 'name' and
ArvadosBase::resource_class_for_uuid(@object.head_uuid) == Collection
redirect_to collection_path(id: @object.uuid)
@object.link_class == 'name' and
ArvadosBase::resource_class_for_uuid(@object.head_uuid) == Collection
redirect_to collection_path(id: @object.uuid)
- elsif @object.is_a?(Group) and
@object.group_class == 'project'
+ elsif @object.is_a?(Group) and
(@object.group_class == 'project' or @object.group_class == 'filter')
redirect_to project_path(id: @object.uuid)
elsif @object
redirect_to @object
redirect_to project_path(id: @object.uuid)
elsif @object
redirect_to @object
@@
-49,7
+49,7
@@
class ActionsController < ApplicationController
return self.send(param)
end
end
return self.send(param)
end
end
- redirect_
to :back
+ redirect_
back(fallback_location: root_path)
end
expose_action :copy_selections_into_project do
end
expose_action :copy_selections_into_project do
@@
-87,6
+87,9
@@
class ActionsController < ApplicationController
end
if resource_class == Collection
dst.manifest_text = Collection.select([:manifest_text]).where(uuid: src.uuid).with_count("none").first.manifest_text
end
if resource_class == Collection
dst.manifest_text = Collection.select([:manifest_text]).where(uuid: src.uuid).with_count("none").first.manifest_text
+ # Fixes bug 19144: nullify some fields that are managed by keep-balance.
+ dst.storage_classes_confirmed = []
+ dst.storage_classes_confirmed_at = nil
end
when :move
dst = src
end
when :move
dst = src
@@
-210,7
+213,7
@@
You can try recreating the collection to get a copy with full provenance data."
# star / unstar the current project
def star
# star / unstar the current project
def star
- links = Link.where(
tail
_uuid: current_user.uuid,
+ links = Link.where(
owner
_uuid: current_user.uuid,
head_uuid: @object.uuid,
link_class: 'star')
head_uuid: @object.uuid,
link_class: 'star')