projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3605-node-info-field' refs #3605
[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 bda7ca3b4450b8cfd0b09d576462a93c0b34b5b7..347644bdbd141092051173315e52afcc3548d03f 100644
(file)
--- a/
apps/workbench/app/controllers/actions_controller.rb
+++ b/
apps/workbench/app/controllers/actions_controller.rb
@@
-158,6
+158,7
@@
class ActionsController < ApplicationController
normalized = arv_normalize combined
newc = Collection.new({:manifest_text => normalized})
normalized = arv_normalize combined
newc = Collection.new({:manifest_text => normalized})
+ newc.name = newc.name || "Collection created at #{Time.now.localtime}"
newc.save!
chash.each do |k,v|
newc.save!
chash.each do |k,v|
@@
-170,12
+171,11
@@
class ActionsController < ApplicationController
l.save!
end
l.save!
end
- if params["show_project"]
- respond_to do |format|
- format.js {render inline: "location.reload();" }
- end
+ action_data = JSON.parse(params['action_data']) if params['action_data']
+ if action_data && action_data['selection_param'].eql?('project')
+ redirect_to :back
else
else
- redirect_to
controller: 'collections', action: :show, id: newc.uuid
+ redirect_to
url_for(controller: 'collections', action: :show, id: newc.uuid)
end
end
end
end