6254: better groups text field label

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index dd2902475594a9c5fb27e6b9ac1bee0d44db1a58..ac3ea606e9f7421fca4b867be61f7a21a1180ece 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -222,7 +222,7 @@ class UsersController < ApplicationController
           end
           if params[:groups]
             new_groups = params[:groups].split(',').map(&:strip).select{|i| !i.empty?}
-            if new_groups != vm_link[:properties][:groups]
+            if vm_link and new_groups != vm_link[:properties][:groups]
               vm_login_link = Link.where(uuid: vm_link[:uuid])
               if vm_login_link.items_available > 0
                 link = vm_login_link.results.first

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 8097b36c1ef90bb8a4a3f96d10f38fd9c4e97175..2bb94dddac50839d9f7cc9685461d81b69fce6ed 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -63,7 +63,7 @@
         </select>
       </div>
       <div class="groups-group">
-        <label for="groups">Groups (comma separated list)</label>
+        <label for="groups">Groups for Virtual Machine (comma separated list)</label>
         <input class="form-control" id="groups" maxlength="250" name="groups" type="text" value="<%=groups%>">
       </div>
     </div>