Merge branch 'master' of http://git.task-on.com/ktask/task-on.com

common/modules/triggers/models/TriggerTrigger.php

@@ -265,7 +265,7 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
                     $schedule = new TriggerSchedule();
                     $schedule->sended=1;
 //                    $schedule->checked=(array_key_exists('checked', $params)) ? $params['checked'] : 0;
-//                    $schedule->message_id=$newMessageId;
+                    $schedule->message_id=$newMessageId;
                     $schedule->message=$template->getTemplate();
                     $schedule->email=$email;
                     $schedule->time=$time_now->format('Y-m-d H:i:s');

console/migrations/m160228_222009_add_template_column_to_trigger_schedule_table.php

+<?php
+
+use yii\db\Migration;
+
+class m160228_222009_add_template_column_to_trigger_schedule_table extends Migration
+{
+    public function up()
+    {
+        $this->addColumn(
+            'trigger_schedule',
+            'template_id',
+            $this->integer(11)->notNull()
+        );
+        $this->addForeignKey(
+            'fk_schedule_template',
+            'trigger_schedule', 'template_id',
+            'message_template', 'id'
+        );
+    }
+
+    public function down()
+    {
+        $this->dropForeignKey(
+            'fk_schedule_template',
+            'trigger_schedule'
+        );
+        $this->dropColumn(
+            'trigger_schedule',
+            'template_id'
+        );
+    }
+}