projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #10078
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
virtual_machines_controller.rb
diff --git
a/apps/workbench/app/controllers/virtual_machines_controller.rb
b/apps/workbench/app/controllers/virtual_machines_controller.rb
index c3512e2e4d1028635cda1a51b1c09f2a2b63ade5..73231f8cc09023ef13006fa6ad3e910d8881e874 100644
(file)
--- a/
apps/workbench/app/controllers/virtual_machines_controller.rb
+++ b/
apps/workbench/app/controllers/virtual_machines_controller.rb
@@
-1,7
+1,4
@@
class VirtualMachinesController < ApplicationController
class VirtualMachinesController < ApplicationController
- def index_pane_list
- %w(recent help)
- end
def index
@objects ||= model_class.all
@vm_logins = {}
def index
@objects ||= model_class.all
@vm_logins = {}
@@
-22,4
+19,14
@@
class VirtualMachinesController < ApplicationController
end
super
end
end
super
end
+
+ def webshell
+ return render_not_found if not Rails.configuration.shell_in_a_box_url
+ @webshell_url = Rails.configuration.shell_in_a_box_url % {
+ uuid: @object.uuid,
+ hostname: @object.hostname,
+ }
+ render layout: false
+ end
+
end
end