6254: instead of tooltip, use a self explanatory label for groups text field.

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 0b74977d0654d8dba0288ef6d016b44833578896..dd2902475594a9c5fb27e6b9ac1bee0d44db1a58 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -213,25 +213,22 @@ class UsersController < ApplicationController
 
         setup_resp = User.setup setup_params
         if setup_resp
-          prev_groups = nil
+          vm_link = nil
           setup_resp[:items].each do |item|
             if item[:head_kind] == "arvados#virtualMachine"
-              prev_groups = item[:properties][:groups]
+              vm_link = item
               break
             end
           end
           if params[:groups]
             new_groups = params[:groups].split(',').map(&:strip).select{|i| !i.empty?}
-            if new_groups != prev_groups
-              vm_login_perms = Link.where(tail_uuid: params['user_uuid'],
-                                          head_kind: 'arvados#virtualMachine',
-                                          link_class: 'permission',
-                                          name: 'can_login')
-              if vm_login_perms.any?
-                perm = vm_login_perms.first
-                props = perm.properties
+            if 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
+                props = link.properties
                 props[:groups] = new_groups
-                perm.save!
+                link.save!
               end
             end
           end

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 8e3b4c4a02f41c8c097cfa57312e7a96e43224eb..8097b36c1ef90bb8a4a3f96d10f38fd9c4e97175 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -63,9 +63,8 @@
         </select>
       </div>
       <div class="groups-group">
-        <label for="groups">Groups</label>
-        <input class="form-control" id="groups" maxlength="250" name="groups" type="text" value="<%=groups%>"
-          title="Comma separated list of groups to which this user belongs">
+        <label for="groups">Groups (comma separated list)</label>
+        <input class="form-control" id="groups" maxlength="250" name="groups" type="text" value="<%=groups%>">
       </div>
     </div>