Fix branch filter in tracker trend model

midasplatform · Apr 15, 2015 · 13a7933 · 13a7933
1 parent eb3ddc5
commit 13a7933
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/modules/tracker/models/pdo/TrendModel.php b/modules/tracker/models/pdo/TrendModel.php
@@ -72,7 +72,7 @@ public function getMatch($producerId, $metricName, $configItemId, $testDatasetId
      * @param null|string $startDate start date
      * @param null|string $endDate end date
      * @param null|int $userId user id
-     * @param null|string $branch branch name
+     * @param null|string|array $branch branch name
      * @return array scalar DAOs
      */
     public function getScalars($trendDao, $startDate = null, $endDate = null, $userId = null, $branch = null)
@@ -91,7 +91,11 @@ public function getScalars($trendDao, $startDate = null, $endDate = null, $userI
         }
 
         if (!is_null($branch)) {
-            $sql->where('branch = ?', $branch);
+            if (is_array($branch)) {
+                $sql->where('branch IN (?)', $branch);
+            } else {
+                $sql->where('branch = ?', $branch);
+            }
         }
 
         $scalarDaos = array();