- Отредактирован метод, возвращающий актуальные триггеры в системе

3163b90e · Shakarim Sapa · 9b8fae69 · 3163b90e
Commit 3163b90e authored Feb 18, 2016 by Shakarim Sapa
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

common/modules/triggers/models/TriggerTrigger.php common/modules/triggers/models/TriggerTrigger.php +5 -2

No files found.
--- a/common/modules/triggers/models/TriggerTrigger.php
+++ b/common/modules/triggers/models/TriggerTrigger.php
@@ -193,10 +193,13 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
    /**
     * Метод возвращает массив актуальных на данный момент триггеров
+     * @param $id
     * @return array|\yii\db\ActiveRecord[]
     */
-    public static function getActualTriggers() {
+    public static function getActualTriggers($id=null) {
-        return TriggerTrigger::find()->indexBy('id')->all();
+        return ($id===null)
+            ? TriggerTrigger::find()->indexBy('id')->all()
+            : TriggerTrigger::find()->joinWith('triggerConditions')->where(['trigger_condition.condition_id' => $id])->all();
    }
    /**