From 67fe30db90787f066807477d0e45dc372779f0f8 Mon Sep 17 00:00:00 2001 From: Alinson Santos Date: Sun, 3 Aug 2008 11:06:11 -0300 Subject: [PATCH] Bugfix --- app/controllers/courses_controller.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 1af0e0f..786daa2 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -25,10 +25,11 @@ class CoursesController < ApplicationController params[:period] = nil if params[:period] == App.current_period @period = params[:period] || App.current_period - conditions = [] - conditions.add_condition!(['period = ?', @period]) - conditions.add_condition!(['id not in (?)', @current_user.courses]) if logged_in? and !@current_user.courses.empty? - @courses = Course.find(:all, :order => 'grade asc, full_name asc', :conditions => conditions) + if logged_in? and !@current_user.courses.empty? + @courses = Course.find(:all, :order => 'grade asc, full_name asc', :conditions => ['period = ? and id not in (?)', @period, @current_user.courses]) + else + @courses = Course.find(:all, :order => 'grade asc, full_name asc', :conditions => ['period = ?', @period]) + end respond_to do |format|