forked from OpenNeo/impress
prep for newid server
This commit is contained in:
parent
ba43d104db
commit
d28e297656
2 changed files with 10 additions and 1 deletions
|
@ -34,6 +34,7 @@
|
||||||
%span
|
%span
|
||||||
== Hey, #{link_to current_user.name, user_contributions_path(current_user)}!
|
== Hey, #{link_to current_user.name, user_contributions_path(current_user)}!
|
||||||
== You have #{current_user.points} points.
|
== You have #{current_user.points} points.
|
||||||
|
= link_to 'Settings', Openneo::Auth.remote_settings_url
|
||||||
= link_to 'Log out', logout_path_with_return_to
|
= link_to 'Log out', logout_path_with_return_to
|
||||||
- else
|
- else
|
||||||
= link_to login_path_with_return_to, :id => 'userbar-log-in' do
|
= link_to login_path_with_return_to, :id => 'userbar-log-in' do
|
||||||
|
|
|
@ -43,7 +43,8 @@ module Openneo
|
||||||
query = {
|
query = {
|
||||||
:app => config.app,
|
:app => config.app,
|
||||||
:session_id => session[:session_id],
|
:session_id => session[:session_id],
|
||||||
:path => params[:return_to] || '/'
|
:path => params[:return_to] || '/',
|
||||||
|
:from => params[:from]
|
||||||
}.to_query
|
}.to_query
|
||||||
uri = URI::HTTP.build({
|
uri = URI::HTTP.build({
|
||||||
:host => config.auth_server,
|
:host => config.auth_server,
|
||||||
|
@ -52,6 +53,13 @@ module Openneo
|
||||||
})
|
})
|
||||||
uri.to_s
|
uri.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def remote_settings_url
|
||||||
|
URI::HTTP.build({
|
||||||
|
:host => config.auth_server,
|
||||||
|
:path => '/users/edit'
|
||||||
|
}).to_s
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue