closes #6414

[arvados.git] / apps / workbench / app / controllers / users_controller.rb

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 0b74977d0654d8dba0288ef6d016b44833578896..4cf1fffc09bb3e3a815311f86c2550bbe16e5f3d 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -9,7 +9,11 @@ class UsersController < ApplicationController
     if params[:uuid] == current_user.uuid
       respond_to do |f|
         f.html do
-          redirect_to(params[:return_to] || project_path(params[:uuid]))
+          if request.url.include?("/users/#{current_user.uuid}")
+            super
+          else
+            redirect_to(params[:return_to] || project_path(params[:uuid]))
+          end
         end
       end
     else
@@ -204,34 +208,28 @@ class UsersController < ApplicationController
         if params['openid_prefix'] && params['openid_prefix'].size>0
           setup_params[:openid_prefix] = params['openid_prefix']
         end
-        if params['repo_name'] && params['repo_name'].size>0
-          setup_params[:repo_name] = params['repo_name']
-        end
         if params['vm_uuid'] && params['vm_uuid'].size>0
           setup_params[:vm_uuid] = params['vm_uuid']
         end
 
         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 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
+                props = link.properties
                 props[:groups] = new_groups
-                perm.save!
+                link.save!
               end
             end
           end