From 3b274c747afff18833fc47169c96c3dd98feda3d Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Fri, 17 Sep 2010 18:37:22 +0000
Subject: [PATCH] Ignore College and/or Department selections if a more
specific seliction has been made for the Department or Subject.
---
application/modules/courses/models/CourseModel.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/modules/courses/models/CourseModel.php b/application/modules/courses/models/CourseModel.php
index ec7a1416..7091c88a 100644
--- a/application/modules/courses/models/CourseModel.php
+++ b/application/modules/courses/models/CourseModel.php
@@ -561,10 +561,10 @@ class Courses_CourseModel extends Unl_Model
$select->where('g.removed = "no"');
}
$select->where('g.type = "official"');
- if ($criteria['college']) {
+ if ($criteria['college'] && !$criteria['department'] && !$criteria['subject']) {
$select->where('l.collegeId = ?', $criteria['college']);
}
- if ($criteria['department']) {
+ if ($criteria['department'] && !$criteria['subject']) {
$select->where('d.departmentId = ?', $criteria['department']);
}
if ($criteria['subject']) {
--
GitLab