diff options
author | Azul <azul@leap.se> | 2013-12-13 14:27:15 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2013-12-13 14:44:04 +0100 |
commit | 496817bd512fe43c4cb80cc49a19dae3ed3eb165 (patch) | |
tree | b8921ca66b47ac071e974659d9eab5aa907a89ee /users/app/controllers | |
parent | e1d9d92d4afe32a6b4c267d9ffb7d8a40c4871e1 (diff) |
refactor: remove Overview controller - we can use Users#show
we were only using Users#show to redirect to the edit action. So I replaced that with the overview and we have no more use for the extra controller.
This also simplifies linking to the users in question a lot.
Diffstat (limited to 'users/app/controllers')
-rw-r--r-- | users/app/controllers/overviews_controller.rb | 9 | ||||
-rw-r--r-- | users/app/controllers/sessions_controller.rb | 4 | ||||
-rw-r--r-- | users/app/controllers/users_controller.rb | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/users/app/controllers/overviews_controller.rb b/users/app/controllers/overviews_controller.rb deleted file mode 100644 index 52ce267..0000000 --- a/users/app/controllers/overviews_controller.rb +++ /dev/null @@ -1,9 +0,0 @@ -class OverviewsController < UsersBaseController - - before_filter :authorize - before_filter :fetch_user - - def show - end - -end diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb index 0494b51..85a022e 100644 --- a/users/app/controllers/sessions_controller.rb +++ b/users/app/controllers/sessions_controller.rb @@ -14,12 +14,12 @@ class SessionsController < ApplicationController end # - # this is a bad hack, but user_overview_url(user) is not available + # this is a bad hack, but user_url(user) is not available # also, this doesn't work because the redirect happens as a PUT. no idea why. # #Warden::Manager.after_authentication do |user, auth, opts| # response = Rack::Response.new - # response.redirect "/users/#{user.id}/overview" + # response.redirect "/users/#{user.id}" # throw :warden, response.finish #end diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 8b4715c..0b32ec7 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -13,7 +13,7 @@ class UsersController < UsersBaseController def index if params[:query] if @user = User.find_by_login(params[:query]) - redirect_to user_overview_url(@user) + redirect_to @user return else @users = User.by_login.startkey(params[:query]).endkey(params[:query].succ) |