6279: add some comments

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index f1985a64284c52450d0f4fcd43f91e284e6cd814..ef7723e42534a9e25228dc37d0c07aa8021a44a4 100644 (file)
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -228,6 +228,7 @@ You can try recreating the collection to get a copy with full provenance data."
     end
   end
 
+  # webshell action is used to login to an arvados shell using workbench
   expose_action :webshell do
     shell_in_a_box_url_config = Rails.configuration.shell_in_a_box_url
 
@@ -241,7 +242,7 @@ You can try recreating the collection to get a copy with full provenance data."
     if not shell_in_a_box_url_config.end_with?('/')
       shell_in_a_box_url_config += '/'
     end
-    @webshell_url = shell_in_a_box_url_config + @webshell_hostname + '/'
+    @webshell_url = shell_in_a_box_url_config + @webshell_hostname
 
     respond_to do |format|
       render partial: 'virtual_machines/webshell'

diff --git a/apps/workbench/public/shell_in_a_box.js b/apps/workbench/public/shell_in_a_box.js
index 111126cb1f78c6271e45275bd5cfeb4327927948..115cc743a0244c96f0bcb1f4ff9c502b3a19bf83 100644 (file)
--- a/apps/workbench/public/shell_in_a_box.js
+++ b/apps/workbench/public/shell_in_a_box.js
@@ -1,3 +1,6 @@
+// This file contains code from shell_in_a_box.js and vt100.js
+
+
 // ShellInABox.js -- Use XMLHttpRequest to provide an AJAX terminal emulator.
 // Copyright (C) 2008-2010 Markus Gutschke <markus@shellinabox.com>
 //