fixed display of new task from recurrent task

Author: Simon Karlen

src/behaviors/RepeatableBehavior.php

@@ -206,6 +206,7 @@ public function updateRecurrentInstance(\yii\base\ModelEvent $event)
             }
             $record->save();
         }
+        $this->owner->setAttribute($this->idProperty, $instance->{$this->idProperty});
 
         $event->isValid = false;
     }

src/controllers/TaskController.php

@@ -433,6 +433,14 @@ public function actionUpdate($id, $updateSeries = false, $return = 'card')
                 return $this->renderAjax('todo', [
                     'kanbanModuleName' => $this->module->id
                 ]);
+            } elseif ($return === 'bucket') {
+                return $this->renderAjax('/bucket/view', [
+                    'model' => $model->bucket,
+                    'statuses' => $this->module->statuses,
+                    'users' => $this->module->users,
+                    'closeModal' => true,
+                    'finishedTasks' => $model->bucket->getTasks()->where(['status' => Task::STATUS_DONE])->count('id')
+                ]);
             }
 
             $model = $this->findModel($model->id);

src/views/task/item.php

@@ -239,7 +239,8 @@ class="dropdown-toggle text-decoration-none text-reset">
                 <?php endif; ?>
                 <?= Html::a(FAS::i('edit'), [
                     'task/update',
-                    'id' => $model->isRecurrentInstance() ? $model->recurrence_parent_id : $model->id
+                    'id' => $model->isRecurrentInstance() ? $model->recurrence_parent_id : $model->id,
+                    'return' => $model->isRecurrentInstance() ? 'bucket' : 'card'
                 ], [
                     'class' => ['btn', 'btn-sm', 'ml-auto', 'kanban-task-update-link'],
                     'data' => [
@@ -292,7 +293,8 @@ class="dropdown-toggle text-decoration-none text-reset">
                         'label' => FAS::i('edit', ['class' => ['mr-1']])->fixedWidth() . ' ' . Yii::t('yii', 'Update'),
                         'url' => [
                             'task/update',
-                            'id' => ($model->isRecurrentInstance() ? $model->recurrence_parent_id : $model->id)
+                            'id' => $model->isRecurrentInstance() ? $model->recurrence_parent_id : $model->id,
+                            'return' => $model->isRecurrentInstance() ? 'bucket' : 'card'
                         ],
                         'linkOptions' => [
                             'data' => [

src/views/task/update.php

@@ -51,7 +51,11 @@
                 'data' => [
                     'turbo-frame' => ($return === 'todo')
                         ? 'kanban-todo-frame'
+                        /*
                         : 'task-' . ($model->isRecurrentInstance() ? $model->recurrence_parent_id : $model->id) . '-frame'
+                        /*/
+                        : ($model->isRecurrentInstance() ? 'bucket-' . $model->bucket_id . '-frame' : 'task-' . $model->id . '-frame')
+                        //*/
                 ]
             ]
         ]); ?>