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