summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-12-16 09:47:53 -0800
committerjessib <jessib@riseup.net>2013-12-16 09:47:53 -0800
commite2638a3a91cb2c6a426f856c4d1919be1a852b6a (patch)
tree3679d9b29dacee6997e9744207e305e32fc3857d /app
parent82d0ff664c9d4f5740c09f6ead28ffc02716956a (diff)
parent496817bd512fe43c4cb80cc49a19dae3ed3eb165 (diff)
Merge pull request #123 from azul/refactor/standartize-user-routes
refactor: remove Overview controller - we can use Users#show
Diffstat (limited to 'app')
-rw-r--r--app/controllers/home_controller.rb2
-rw-r--r--app/views/layouts/_navigation.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index be26eb6..1d62178 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -3,7 +3,7 @@ class HomeController < ApplicationController
def index
if logged_in?
- redirect_to user_overview_url(current_user)
+ redirect_to current_user
end
end
end
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 992aa46..6de567a 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,5 +1,5 @@
%ul.nav.sidenav
- = link_to_navigation t(:overview), user_overview_path(@user), :active => controller?(:overviews)
+ = link_to_navigation t(:overview), @user, :active => controller?(:overviews)
= link_to_navigation t(:account_settings), edit_user_path(@user), :active => controller?(:users)
- # will want link for identity settings
= link_to_navigation t(:support_tickets), auto_tickets_path, :active => controller?(:tickets)