- Изменена логика формирования html кнопок управления условиями

common/modules/triggers/controllers/TriggerAdminController.php

@@ -35,23 +35,15 @@ class TriggerAdminController extends AdminController {
     }
 
     public function actionGetandconditionhtml(){
-        $result = '<tr data-key='.rand(100000,999999).'><td>'.Conditions::init()->getControlArea().'</td></tr>';
+        $result = TriggerTrigger::getControlButtons();
         return (Yii::$app->request->isAjax) ? Json::encode($result) : $result;
     }
 
     public function actionGetconditionhtml($id, $key){
-        $condition = Conditions::init()->getConditionById($id);
-        $result = $this->renderPartial(
-            'condition-html',
-            [
-                'object' => $condition,
-                'key' => $key
-            ]
-        );
+        $result = Conditions::getConditionHtml($id, $key);
         return Json::encode($result);
     }
 
-
     public function actionTesting(){
         return $this->render(
             'testing'
@@ -82,9 +74,6 @@ class TriggerAdminController extends AdminController {
 
         if ($model->load(Yii::$app->request->post())) {
             $model->conditions = Yii::$app->request->post('Conditions');
-            $model->conditions = array_values($model->conditions);
-            var_dump($model->conditions);
-            die;
             $datetime=new \DateTime();
             $model->owner_id = Yii::$app->user->getId();
             $model->date_create=$datetime->format('Y-m-d H:i:s');
@@ -112,8 +101,10 @@ class TriggerAdminController extends AdminController {
     public function actionUpdate($id){
         /** @var TriggerTrigger $model */
         $model = TriggerTrigger::findOne($id);
+        $model->setScenario('update');
 
         if ($model->load(Yii::$app->request->post())) {
+            $model->conditions = Yii::$app->request->post('Conditions');
             $datetime=new \DateTime();
             $model->owner_id = Yii::$app->user->getId();
             $model->date_create=$datetime->format('Y-m-d H:i:s');