diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-03-04 10:46:46 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-03-04 10:46:46 +0000 |
| commit | ede46dc8dc6c97cdad8c3fcb3bd42ede5c25f395 (patch) | |
| tree | 44e03358c9fa7ca6826e631d1d3d6c1030b1b0d5 /app/controllers/user_controller.rb | |
| parent | 8e911d5bd0e60a0e0e4859868662cc176419d2e3 (diff) | |
| parent | a38b2989aebf8d554b7287e18528bed8c9e67d3b (diff) | |
Merge branch 'release/0.17'0.17
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 175425280..8d6522923 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -26,12 +26,15 @@ class UserController < ApplicationController if params[:view].nil? @show_requests = true @show_profile = true + @show_batches = false elsif params[:view] == 'profile' @show_profile = true @show_requests = false + @show_batches = false elsif params[:view] == 'requests' @show_profile = false @show_requests = true + @show_batches = true end @display_user = User.find(:first, :conditions => [ "url_name = ? and email_confirmed = ?", params[:url_name], true ]) |