关注需求功能取消，部分用户进入个人主页报错

app/controllers/users_controller.rb

@@ -25,7 +25,7 @@ class UsersController < ApplicationController
   menu_item :user_course, :only => :user_courses
   menu_item :user_homework, :only => :user_homeworks
   menu_item :user_project, :only => [:user_projects, :watch_projects]
-  menu_item :requirement_focus, :only => :watch_bids
+  # menu_item :requirement_focus, :only => :watch_bids
   menu_item :requirement_focus, :only => :watch_contests   
   menu_item :user_newfeedback, :only => :user_newfeedback
   
@@ -36,14 +36,14 @@ class UsersController < ApplicationController
 
   #
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
-  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_bids, :watch_contests, :info,
+  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_contests, :info,
     :user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,
     :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
     :activity_new_score_index, :influence_new_score_index, :score_new_index,:update_score,:user_activities,:user_projects_index]
   #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses, 
                                   :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, 
-                                  :watch_bids, :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index, 
+                                  :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
                                   :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                   :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index]
   before_filter :auth_user_extension, only: :show
@@ -141,25 +141,25 @@ class UsersController < ApplicationController
 
   ##added by fq
   def watch_bids
-    cond = 'bids.reward_type <> 1'     
+    # cond = 'bids.reward_type <> 1'
-    @bids = Bid.watched_by(@user).where('reward_type = ?', 1) # added by huang
+    # @bids = Bid.watched_by(@user).where('reward_type = ?', 1) # added by huang
-    @offset, @limit = api_offset_and_limit({:limit => 10})
+    # @offset, @limit = api_offset_and_limit({:limit => 10})
-    @bid_count = @bids.count
+    # @bid_count = @bids.count
-    @bid_pages = Paginator.new @bid_count, @limit, params['page']
+    # @bid_pages = Paginator.new @bid_count, @limit, params['page']
-    @offset ||= @bid_pages.reverse_offset 
+    # @offset ||= @bid_pages.reverse_offset
-    unless @offset == 0
+    # unless @offset == 0
-      @bid = @bids.offset(@offset).limit(@limit).all.reverse
+    #   @bid = @bids.offset(@offset).limit(@limit).all.reverse
-    else
+    # else
-      limit = @bid_count % @limit
+    #   limit = @bid_count % @limit
-      @bid = @bids.offset(@offset).limit(limit).all.reverse
+    #   @bid = @bids.offset(@offset).limit(limit).all.reverse
-    end
+    # end
-   
+    #
-    respond_to do |format|
+    # respond_to do |format|
-      format.html {
+    #   format.html {
-        render :layout => 'base_users'
+    #     render :layout => 'base_users'
-      }
+    #   }
-      format.api
+    #   format.api
-    end
+    # end
   end
   
 #new add by linchun
@@ -215,24 +215,24 @@ class UsersController < ApplicationController
   
   # added by huang
   def user_homeworks                
-      @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
+      # @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
-      @memberships = []
+      # @memberships = []
-      @membership.each do |membership|
+      # @membership.each do |membership|
-        if membership.project.project_type == 1
+      #   if membership.project.project_type == 1
-          @memberships << membership 
+      #     @memberships << membership
-        end
+      #   end
-      end
+      # end
-      @bid = []
+      # @bid = []
-      @memberships.each do |membership|
+      # @memberships.each do |membership|
-      @bid += membership.project.homeworks
+      # @bid += membership.project.homeworks
-      end
+      # end
-      @bid = @bid.group_by {|bid| bid.courses.first.id}
+      # @bid = @bid.group_by {|bid| bid.courses.first.id}
-      unless User.current.admin?
+      # unless User.current.admin?
-      if !@user.active? 
+      # if !@user.active?
-        render_404
+      #   render_404
-      return
+      # return
-      end 
+      # end
-      end  
+      # end
   end 
   
   
@@ -757,7 +757,7 @@ class UsersController < ApplicationController
     when '3' then
       @obj = Issue.find_by_id(@obj_id)
     when '4' then
-      @obj = Bid.find_by_id(@obj_id)
+      # @obj = Bid.find_by_id(@obj_id)
     when '5' then
       @obj = Forum.find_by_id(@obj_id)
     when '6'
@@ -800,7 +800,7 @@ class UsersController < ApplicationController
       when '3' then
         @obj = Issue.find_by_id(@obj_id)
       when '4' then
-        @obj = Bid.find_by_id(@obj_id)
+        # @obj = Bid.find_by_id(@obj_id)
       when '5' then
         @obj = Forum.find_by_id(@obj_id)
       when '6'

lib/redmine.rb

@@ -451,7 +451,7 @@ Redmine::MenuManager.map :user_enterprise_menu do |menu|
  
   menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.host_name}
   
-  menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.host_user}
+  # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.host_user}
   menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.host_user}
   
 end
@@ -459,7 +459,7 @@ Redmine::MenuManager.map :user_menu_self do |menu|
   menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.host_name }
   menu.push :user_information, {:controller => 'users', :action => 'info', :host => Setting.host_user}  
   menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.host_name}
-  menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.host_user}
+  # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.host_user}
   menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.host_user}
   
 end