X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/26446197bb00d7f899673b7f9434e6bd622b8904..ac5cd5913a208c463206d2fa6cf62e42148682a4:/services/api/app/controllers/arvados/v1/users_controller.rb diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb index c5fc38d89a..58661a0e9a 100644 --- a/services/api/app/controllers/arvados/v1/users_controller.rb +++ b/services/api/app/controllers/arvados/v1/users_controller.rb @@ -4,7 +4,7 @@ class Arvados::V1::UsersController < ApplicationController skip_before_filter :render_404_if_no_object, only: [:activate, :event_stream, :current, :system, :setup] before_filter :admin_required, only: [:setup, :unsetup] - + def current @object = current_user show @@ -29,7 +29,7 @@ class Arvados::V1::UsersController < ApplicationController end end end - + def event_stream channel = current_user.andand.uuid if current_user.andand.is_admin @@ -124,7 +124,8 @@ class Arvados::V1::UsersController < ApplicationController end if object_found - @response = @object.setup_repo_vm_links params[:repo_name], params[:vm_uuid] + @response = @object.setup_repo_vm_links params[:repo_name], + params[:vm_uuid], params[:openid_prefix] else @response = User.setup @object, params[:openid_prefix], params[:repo_name], params[:vm_uuid]