fixed task update of recurring task

fixed copy task of recurring task fixed creation of a monitoring
simialbi · Dec 20, 2021 · 6c06bcc · 6c06bcc
1 parent 7bd26af
commit 6c06bcc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ $ php composer.phar require --prefer-dist simialbi/yii2-kanban
 or add
 
 ```
-"simialbi/yii2-kanban": "^1.0.0"
+"simialbi/yii2-kanban": "^2.0.0"
 ```
 
 to the `require` section of your `composer.json`.

diff --git a/src/behaviors/RepeatableBehavior.php b/src/behaviors/RepeatableBehavior.php
@@ -101,6 +101,10 @@ public function events()
         ];
     }
 
+    /**
+     * @param \yii\base\ModelEvent $event
+     * @throws \yii\base\InvalidConfigException
+     */
     public function deleteRecurrentInstance(\yii\base\ModelEvent $event)
     {
         if (!$this->isRecurrentInstance()) {

diff --git a/src/controllers/TaskController.php b/src/controllers/TaskController.php
@@ -134,10 +134,8 @@ public function actionHistory($id)
      */
     protected function findModel($id)
     {
-//        if (preg_match('#^r-\d+$#', $id)) {
-//            $id = preg_replace('#[^\d]#', '', $id);
-//        }
-        if (($model = Task::findOne($id)) !== null) {
+        /** @var $model Task */
+        if (($model = Task::find()->with('assignments')->where(['id' => $id])->one()) !== null) {
             return $model;
         } else {
             throw new NotFoundHttpException(Yii::t('yii', 'Page not found.'));
@@ -437,7 +435,7 @@ public function actionUpdate($id, $updateSeries = false, $return = 'card')
                 ]);
             }
 
-            $model = Task::findOne(['id' => $model->id]);
+            $model = $this->findModel($model->id);
 
             return $this->renderAjax('item', [
                 'boardId' => $model->board->id,
@@ -484,11 +482,16 @@ public function actionUpdate($id, $updateSeries = false, $return = 'card')
     public function actionCopyPerUser($id, $group = 'bucket')
     {
         $model = $this->findModel($id);
+
+        if ($model->isRecurrentInstance()) {
+            $model = $model->getOriginalRecord();
+        }
+
         $assignees = Yii::$app->request->getBodyParam('assignees', []);
 
         if (Yii::$app->request->isPost && !empty($assignees)) {
             foreach ($assignees as $assignee) {
-                $newTask = new Task($model->toArray());
+                $newTask = new Task($model);
                 $newTask->id = null;
                 if (!$newTask->save()) {
                     continue;

diff --git a/src/views/monitoring/index.php b/src/views/monitoring/index.php
@@ -40,7 +40,8 @@
                         'data' => [
                             'toggle' => 'modal',
                             'pjax' => '0',
-                            'target' => '#taskModal'
+                            'turbo-frame' => 'task-modal-frame',
+                            'target' => '#task-modal'
                         ]
                     ])
                 ]