|
|
|
@ -150,9 +150,10 @@ class UsersController < ApplicationController
|
|
|
|
|
|
|
|
|
|
# added by fq
|
|
|
|
|
def user_courses
|
|
|
|
|
@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current)).reverse
|
|
|
|
|
case params[:type]
|
|
|
|
|
when "2"
|
|
|
|
|
@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
|
|
|
|
when "2"
|
|
|
|
|
#@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
|
|
|
|
@memberships = []
|
|
|
|
|
@membership.each do |membership|
|
|
|
|
|
if membership.project.project_type == 1
|
|
|
|
@ -162,7 +163,7 @@ class UsersController < ApplicationController
|
|
|
|
|
@state = 2
|
|
|
|
|
|
|
|
|
|
when "1"
|
|
|
|
|
@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
|
|
|
|
#@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
|
|
|
|
@memberships = []
|
|
|
|
|
@membership.each do |membership|
|
|
|
|
|
if membership.project.project_type == 1
|
|
|
|
@ -177,7 +178,7 @@ class UsersController < ApplicationController
|
|
|
|
|
@state = 1
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
|
|
|
|
#@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
|
|
|
|
@memberships = []
|
|
|
|
|
@membership.each do |membership|
|
|
|
|
|
if membership.project.project_type == 1
|
|
|
|
|