projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
17154: Make sure most current user record is loaded.
[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 febd6e3a1d22ba561b458a9b8bbe86f92466a9eb..d782bcb40033b658a5cbfee34aba526662999ab1 100644
(file)
--- a/
apps/workbench/app/controllers/users_controller.rb
+++ b/
apps/workbench/app/controllers/users_controller.rb
@@
-39,6
+39,7
@@
class UsersController < ApplicationController
def profile
params[:offer_return_to] ||= params[:return_to]
+ Thread.current[:user] = User.find(current_user.uuid)
end
def activity
@@
-124,7
+125,7
@@
class UsersController < ApplicationController
def show_pane_list
if current_user.andand.is_admin
- super | %w(Admin)
+ %w(Admin) | super
else
super
end