Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

2014-05-28 14:17:53 +08:00 · 2014-05-28 14:17:53 +08:00 · eb0e149ac7
parent daecf1a53b 5d8edb218f
commit eb0e149ac7
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -65,7 +65,7 @@ class UsersController < ApplicationController
  def user_projects
    
    if User.current.admin?
-      @memberships = @user.memberships.all
+      @memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}")
    else
      cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1"
      @memberships = @user.memberships.all(:conditions => cond)