v1.8.1 stage D button save & close unnecessary bugfix
This commit is contained in:
@@ -24,7 +24,6 @@ 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(),
|
||||
)));
|
||||
@@ -44,7 +43,6 @@ 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,
|
||||
@@ -57,7 +55,6 @@ 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 {
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
<?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);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user