Merge branch 'feature/batch-requests' into rails-3-develop

Conflicts:
    config/general.yml-example
    spec/factories.rb

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 ])