Created
August 29, 2013 19:58
-
-
Save davidcroda/6382706 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/assignments_controller.php b/app/controllers/assignments_controller.php | |
index 26326ef..9b0f42c 100755 | |
--- a/app/controllers/assignments_controller.php | |
+++ b/app/controllers/assignments_controller.php | |
@@ -850,7 +850,7 @@ class AssignmentsController extends AppController { | |
$filter['Campaign.archived'] = 0; | |
$filter['Assignment.hidden'] = 0; | |
- if(isset($filter['Article.market_id'])) { | |
+ if(isset($filter['Article.market_id']) || isset($filter['OR']['Article.title LIKE'])) { | |
$this->AssignmentConnection->unbindModel(array('belongsTo' => array('Assignment','Connection'))); | |
unset($this->paginate['AssignmentConnection']['contain']['Assignment']); | |
$this->paginate['AssignmentConnection']['joins'] = array( | |
diff --git a/app/models/assignment_connection.php b/app/models/assignment_connection.php | |
index f73e9a5..a0527fd 100644 | |
--- a/app/models/assignment_connection.php | |
+++ b/app/models/assignment_connection.php | |
@@ -26,7 +26,7 @@ class AssignmentConnection extends AppModel { | |
'conditions' => $conditions, | |
'recursive' => $recursive | |
); | |
- if(isset($conditions['Article.market_id'])) { | |
+ if(isset($conditions['Article.market_id']) || isset($conditions['OR']['Article.title LIKE'])) { | |
$this->unbindModel(array('belongsTo' => array('Assignment','Connection'))); | |
$params['joins'] = array( | |
array( |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment