diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cdfda4d9c..01347a571 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -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 diff --git a/app/views/users/_my_course.html.erb b/app/views/users/_my_course.html.erb index 6a461c6ce..c06abe4b0 100644 --- a/app/views/users/_my_course.html.erb +++ b/app/views/users/_my_course.html.erb @@ -46,8 +46,8 @@