Tasks Module Issues

humhub · Nov 26, 2024 · 4ecfddb · 4ecfddb
1 parent d6065b7
commit 4ecfddb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/assets/Assets.php b/assets/Assets.php
@@ -12,6 +12,7 @@
 use humhub\components\assets\AssetBundle;
 use humhub\modules\tasks\controllers\ListController;
 use humhub\modules\tasks\controllers\SearchController;
+use Yii;
 
 class Assets extends AssetBundle
 {
@@ -49,6 +50,14 @@ public static function register($view)
                 . '.task-overview #task-filter-nav .task-bottom-panel .filterInput[data-filter-type=checkbox] .fa.fa-check-square-o{border-color:var(--info);background:var(--info)}');
         }
 
+        $view->registerJsConfig([
+            'task' => [
+                'text' => [
+                    'success.delete' => Yii::t('base', 'Deleted'),
+                ],
+            ],
+        ]);
+
         return parent::register($view);
     }
 }
diff --git a/controllers/TaskController.php b/controllers/TaskController.php
@@ -73,7 +73,7 @@ public function actionEdit($id = null, $cal = false, $redirect = false, $listId
             $taskForm->createNew($this->contentContainer);
         } else {
             $taskForm = new TaskForm([
-                'task' => Task::find()->contentContainer($this->contentContainer)->where(['task.id' => $id])->one(),
+                'task' => $this->getTaskById($id),
                 'cal' => $cal,
                 'redirect' => $redirect,
                 'wall' => $wall,
@@ -162,11 +162,7 @@ public function actionTaskResponsiblePicker($keyword = '')
 
     public function actionView($id)
     {
-        $task = Task::find()->contentContainer($this->contentContainer)->where(['task.id' => $id])->one();
-
-        if (!$task) {
-            throw new HttpException(404);
-        }
+        $task = $this->getTaskById($id);
 
         if (!$task->content->canView()) {
             throw new HttpException(403);
@@ -179,11 +175,7 @@ public function actionView($id)
 
     public function actionLoadAjaxTask($id)
     {
-        $task = Task::find()->contentContainer($this->contentContainer)->where(['task.id' => $id])->one();
-
-        if (!$task) {
-            throw new HttpException(404);
-        }
+        $task = $this->getTaskById($id);
 
         if (!$task->content->canView()) {
             throw new HttpException(403);

diff --git a/resources/js/humhub.task.js b/resources/js/humhub.task.js
@@ -192,6 +192,20 @@ humhub.module('task', function (module, require, $) {
         });
      };
 
+    var deleteTaskFromContext = function(evt) {
+        var widget = Widget.closest(evt.$trigger);
+        widget.$.fadeOut('fast');
+
+        client.post(evt).then(function() {
+            event.trigger('task.afterDelete');
+            $('#task-space-menu').find('a:first').click();
+            module.log.success(module.text('success.delete'));
+        }).catch(function(e) {
+            widget.$.fadeIn('fast');
+            module.log.error(e, true);
+        });
+     };
+
     /**
      * @param evt
      */
@@ -255,6 +269,7 @@ humhub.module('task', function (module, require, $) {
         init: init,
         Form: Form,
         deleteTask: deleteTask,
+        deleteTaskFromContext: deleteTaskFromContext,
         changeState: changeState,
         extensionrequest:extensionrequest
     });

diff --git a/resources/js/humhub.task.list.js b/resources/js/humhub.task.list.js
@@ -376,9 +376,9 @@ humhub.module('task.list', function (module, require, $) {
                     that.$.find('.task-list-task-details').hide();
                 }
 
-                if (that.isCompleted()) {
+                if (that.isCompleted() && that.parent()) {
                     that.parent().prependCompleted(that);
-                } else if(that.$.closest('.tasks-completed')) {
+                } else if(that.$.closest('.tasks-completed') && that.parent()) {
                     that.parent().prependPending(that);
                 }  else {
                     that.$.fadeIn();

diff --git a/widgets/TaskContextMenu.php b/widgets/TaskContextMenu.php
@@ -96,7 +96,7 @@ public function initControls()
                 'icon' => 'trash',
                 'sortOrder' => 300,
                 'htmlOptions' => [
-                    'data-action-click' => 'ui.modal.post',
+                    'data-action-click' => 'task.deleteTaskFromContext',
                     'data-action-click-url' => TaskUrl::deleteTask($this->task),
                     'data-action-confirm-header' => Yii::t('TasksModule.base', '<strong>Confirm</strong> task deletion'),
                     'data-action-confirm' => Yii::t('TasksModule.base', 'Do you really want to delete this task?'),