add Save & Close button on the task edit form v1.8 t2

Asset/js/save-close.js

@@ -0,0 +1,39 @@
+/*
+ * OrganonTweaks -- the "Save & Close" button on the task edit form. It is a plain type=button (so it
+ * never becomes the Enter default -- Enter still triggers the core Save), and on click it repoints
+ * the form to the plugin's TaskSaveCloseController and lets Kanboard's own modal submit it. Kanboard
+ * keeps ownership of the POST, CSRF, error re-render, and the X-Ajax-Redirect navigation; we only
+ * change the destination, so the controller redirects to the board instead of the card view.
+ */
+(function () {
+    "use strict";
+
+    document.addEventListener("click", function (e) {
+        if (!e.target || !e.target.closest) {
+            return;
+        }
+
+        var btn = e.target.closest("[data-organon-save-close]");
+        if (!btn) {
+            return;
+        }
+
+        e.preventDefault();
+
+        var form = btn.closest("form");
+        var url = btn.getAttribute("data-url");
+        if (!form || !url) {
+            return;
+        }
+
+        form.setAttribute("action", url);
+
+        if (window.KB && KB.modal && KB.modal.isOpen && KB.modal.isOpen() && KB.modal.submitForm) {
+            KB.modal.submitForm();
+        } else if (form.requestSubmit) {
+            form.requestSubmit();
+        } else {
+            form.submit();
+        }
+    }, false);
+})();

Asset/js/title-click-edit.js

@@ -1,11 +1,13 @@
 /*
  * OrganonTweaks -- clicking a task title opens the edit modal instead of the read-only card view,
- * reusing Kanboard's own modal opener (KB.modal.open). Board part: the title is a link, and a hidden
- * marker rendered next to it (only when the user may edit) carries the server-generated edit URL.
+ * reusing Kanboard's own modal opener (KB.modal.open).
+ *   - Board: the title is a link, and a hidden marker rendered next to it (only when the user may
+ *     edit) carries the server-generated edit URL.
+ *   - Card view: the title (#task-summary > h2) opens the same modal via #task-view's data-edit-url,
+ *     but only when the user may edit -- detected by the presence of the sidebar "Edit" action.
  *
- * A capture-phase delegated click is used so it (a) runs before Kanboard's own bubble-phase handlers,
- * (b) survives the board's AJAX re-renders without re-binding, and (c) stops both the link navigation
- * and the card's own click.
+ * A capture-phase delegated click runs before Kanboard's own handlers, survives the board's AJAX
+ * re-renders, and stops both the link navigation and the card's own click.
  */
 (function () {
     "use strict";
@@ -16,6 +18,11 @@
         }
     }
 
+    // The sidebar "Edit the task" action (fa-edit) only renders when the current user may edit.
+    function canEdit() {
+        return !!document.querySelector(".sidebar a i.fa-edit");
+    }
+
     document.addEventListener("click", function (e) {
         if (!e.target || !e.target.closest) {
             return;
@@ -31,6 +38,30 @@
                 e.stopPropagation();
                 openEdit(marker.getAttribute("data-url"));
             }
+            return;
+        }
+
+        // Card-view title -> open the same edit modal (#task-view carries the edit URL).
+        var title = e.target.closest("#task-summary > h2");
+        if (title && canEdit()) {
+            var taskView = document.querySelector("#task-view");
+            if (taskView && taskView.getAttribute("data-edit-url")) {
+                openEdit(taskView.getAttribute("data-edit-url"));
+            }
         }
     }, true);
+
+    // Make the card-view title look clickable (the board title is already a link).
+    function markTitle() {
+        var title = document.querySelector("#task-summary > h2");
+        if (title && canEdit()) {
+            title.style.cursor = "pointer";
+        }
+    }
+
+    if (document.readyState !== "loading") {
+        markTitle();
+    } else {
+        document.addEventListener("DOMContentLoaded", markTitle);
+    }
 })();

Controller/ConfigController.php

@@ -24,6 +24,7 @@ class ConfigController extends BaseController
                 'organon_tweaks_recurring_filters' => (int) $this->configModel->get('organon_tweaks_recurring_filters', 1),
                 'organon_tweaks_shortcut_labels' => (int) $this->configModel->get('organon_tweaks_shortcut_labels', 1),
                 'organon_tweaks_title_click_edit' => (int) $this->configModel->get('organon_tweaks_title_click_edit', 1),
+                'organon_tweaks_save_close_button' => (int) $this->configModel->get('organon_tweaks_save_close_button', 1),
             ),
             'errors' => array(),
         )));
@@ -43,6 +44,7 @@ class ConfigController extends BaseController
         $recurringFilters = isset($values['organon_tweaks_recurring_filters']) ? 1 : 0;
         $shortcutLabels = isset($values['organon_tweaks_shortcut_labels']) ? 1 : 0;
         $titleClickEdit = isset($values['organon_tweaks_title_click_edit']) ? 1 : 0;
+        $saveCloseButton = isset($values['organon_tweaks_save_close_button']) ? 1 : 0;
 
         if ($this->configModel->save(array(
             'organon_tweaks_always_comment_icon' => $alwaysCommentIcon,
@@ -55,6 +57,7 @@ class ConfigController extends BaseController
             'organon_tweaks_recurring_filters' => $recurringFilters,
             'organon_tweaks_shortcut_labels' => $shortcutLabels,
             'organon_tweaks_title_click_edit' => $titleClickEdit,
+            'organon_tweaks_save_close_button' => $saveCloseButton,
         ))) {
             $this->flash->success(t('Settings saved successfully.'));
         } else {

Controller/TaskSaveCloseController.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Kanboard\Plugin\OrganonTweaks\Controller;
+
+use Kanboard\Controller\TaskModificationController;
+
+/**
+ * "Save & Close": the exact core task update, but on success it redirects to the BOARD instead of
+ * reopening the card view. The plugin's "Save & Close" button repoints the edit form here (via JS),
+ * so everything else -- validation, permission checks, CSRF, and the modal error re-render -- is
+ * inherited unchanged from core TaskModificationController. This mirrors core update() line for line
+ * except the one redirect target (kept in sync on Kanboard upgrades).
+ */
+class TaskSaveCloseController extends TaskModificationController
+{
+    public function update()
+    {
+        $task = $this->getTask();
+        $values = $this->request->getValues();
+        $values['id'] = $task['id'];
+        $values['project_id'] = $task['project_id'];
+
+        list($valid, $errors) = $this->taskValidator->validateModification($values);
+
+        if ($valid && $this->updateTask($task, $values, $errors)) {
+            $this->flash->success(t('Task updated successfully.'));
+            $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $task['project_id'])), true);
+        } else {
+            $this->flash->failure(t('Unable to update your task.'));
+            $this->edit($values, $errors);
+        }
+    }
+}

Plugin.php

@@ -77,6 +77,17 @@ class Plugin extends Base
             $this->template->hook->attach('template:board:private:task:before-title', 'organonTweaks:board/title_edit');
         }
 
+        // Tweak: a "Save & Close" button on the task edit form that saves and returns to the board
+        // (core only reopens the card view). The button posts to a small plugin controller that
+        // reuses core's update and changes only the redirect; the JS repoints the form action, so
+        // Kanboard's modal still owns the submit, CSRF, and error re-render.
+        if ((int) $this->configModel->get('organon_tweaks_save_close_button', 1) === 1) {
+            $this->template->hook->attach('template:task:form:bottom-before-buttons', 'organonTweaks:task_form/save_close_button');
+            $this->hook->on('template:layout:js', array(
+                'template' => 'plugins/OrganonTweaks/Asset/js/save-close.js',
+            ));
+        }
+
         // Auto-managed shared custom filters (v1.5 "Show all tasks", v1.6 month filters, v1.7
         // recurring filters). Ensured lazily whenever a project header renders (covers old + new
         // boards); each group is gated by its own config toggle inside
@@ -128,7 +139,7 @@ class Plugin extends Base
 
     public function getPluginVersion()
     {
-        return '1.7.2';
+        return '1.8.0';
     }
 
     public function getPluginHomepage()

Template/config/show.php

@@ -57,6 +57,9 @@
 
         <?= $this->form->checkbox('organon_tweaks_title_click_edit', t('Clicking a task title opens the edit form'), 1, isset($values['organon_tweaks_title_click_edit']) && $values['organon_tweaks_title_click_edit'] == 1) ?>
         <p class="form-help"><?= t('On the board and the card view, click the title to open the edit modal (only where you may edit).') ?></p>
+
+        <?= $this->form->checkbox('organon_tweaks_save_close_button', t('Add a "Save & Close" button to the task edit form'), 1, isset($values['organon_tweaks_save_close_button']) && $values['organon_tweaks_save_close_button'] == 1) ?>
+        <p class="form-help"><?= t('Saves the task and returns to the board, instead of reopening the card view.') ?></p>
     </fieldset>
 
     <div class="form-actions">

Template/task_form/save_close_button.php

@@ -0,0 +1,8 @@
+<?php $task_id = isset($values['id']) ? (int) $values['id'] : 0 ?>
+<?php if ($task_id > 0): ?>
+    <button type="button" class="btn"
+            data-organon-save-close="1"
+            data-url="<?= $this->url->href('TaskSaveCloseController', 'update', array('plugin' => 'OrganonTweaks', 'task_id' => $task_id)) ?>">
+        <?= t('Save & Close') ?>
+    </button>
+<?php endif ?>

VERSION

@@ -1 +1 @@
-OrganonTweaks v1.7.2
+OrganonTweaks v1.8