summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
Diffstat (limited to 'users/app')
-rw-r--r--users/app/controllers/v1/sessions_controller.rb2
-rw-r--r--users/app/views/overviews/show.html.haml1
2 files changed, 2 insertions, 1 deletions
diff --git a/users/app/controllers/v1/sessions_controller.rb b/users/app/controllers/v1/sessions_controller.rb
index c99d1f3..1b20a82 100644
--- a/users/app/controllers/v1/sessions_controller.rb
+++ b/users/app/controllers/v1/sessions_controller.rb
@@ -35,7 +35,7 @@ module V1
protected
def login_response
- handshake = session.delete(:handshake)
+ handshake = session.delete(:handshake) || {}
handshake.to_hash.merge(:id => current_user.id, :token => @token.id)
end
diff --git a/users/app/views/overviews/show.html.haml b/users/app/views/overviews/show.html.haml
index 898cfa0..e43a193 100644
--- a/users/app/views/overviews/show.html.haml
+++ b/users/app/views/overviews/show.html.haml
@@ -19,3 +19,4 @@
%li= icon('user') + link_to(t(:overview_account), edit_user_path(@user))
%li= icon('envelope') + link_to(t(:overview_email), edit_user_email_settings_path(@user))
%li= icon('question-sign') + link_to(t(:overview_tickets), user_tickets_path(@user))
+ %li= icon('shopping-cart') + link_to(t(:overview_billing), show_or_new_customer_link(@user)) if engine_enabled('LeapWebBilling')