- Немного изменена логика формирования html блока, подгружающего кнопки управления условиями

common/modules/triggers/components/conditions/Conditions.php

@@ -8,6 +8,7 @@
  */
 namespace common\modules\triggers\components\conditions;
 
+use common\modules\triggers\controllers\TriggerAdminController;
 use yii\web\ServerErrorHttpException;
 
 class Conditions {
@@ -88,11 +89,33 @@ class Conditions {
         return null;
     }
 
+    public static function getConditionHtml($id, $key, $values=array()){
+        $condition = Conditions::init()->getConditionById($id);
+        $condition_key = rand(100,999);
+        $result = '<div class="alert alert-info alert-dismissible" role="alert">';
+        $result.= '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>';
+        $result.= '<strong>Условие: '.$condition->getName().'</strong>';
+        $result.= '<input type="hidden" name="Conditions['.$key.']['.$condition->getId().$condition_key.'][id]" value="'.$condition->getId().'"/>';
+        foreach($condition->getParams($key, $condition_key, $values) as $param) {
+            $result.=$param;
+        }
+        $result.= '</div>';
+        return $result;
+    }
+
     /**
+     * @param array $condition_array
+     * @param $key
      * @return string
      */
-    public function getControlArea(){
-        $html  = '<div class="conditions-block"></div>';
+    public function getControlArea($condition_array=array(), $key=null){
+        $html  = '<div class="conditions-block">';
+        if (count($condition_array)>0) {
+            foreach($condition_array as $condition) {
+                $html .= self::getConditionHtml($condition['id'], ($key!==null) ? $key : rand(100000,999999), (array_key_exists('params', $condition)) ? $condition['params'] : array());
+            }
+        }
+        $html .= '</div>';
         $html .= '<div class="btn-group" role="group">';
         $html .= '<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="glyphicon glyphicon-plus"></i></button>';
         $html .= '<ul class="dropdown-menu">';