isoron/wikiufc
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Alinson S. Xavier
2008-08-03 11:06:11 -03:00
parent d235466463
commit 67fe30db90
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/courses_controller.rb
View File

@@ -25,10 +25,11 @@ class CoursesController < ApplicationController
params[:period] = nil if params[:period] == App.current_period params[:period] = nil if params[:period] == App.current_period
@period = params[:period] || App.current_period @period = params[:period] || App.current_period
conditions = [] if logged_in? and !@current_user.courses.empty?
conditions.add_condition!(['period = ?', @period]) @courses = Course.find(:all, :order => 'grade asc, full_name asc', :conditions => ['period = ? and id not in (?)', @period, @current_user.courses])
conditions.add_condition!(['id not in (?)', @current_user.courses]) if logged_in? and !@current_user.courses.empty? else
@courses = Course.find(:all, :order => 'grade asc, full_name asc', :conditions => conditions) @courses = Course.find(:all, :order => 'grade asc, full_name asc', :conditions => ['period = ?', @period])
end
respond_to do |format| respond_to do |format|