From 8c6015a5ea58f296f42ba45d80b467f28288bc33 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 21 Mar 2019 09:53:46 +0800 Subject: [PATCH] * Finish task #5346. --- module/project/js/kanban.js | 14 -------------- module/task/control.php | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js index a23204f053..cbe413726a 100644 --- a/module/project/js/kanban.js +++ b/module/project/js/kanban.js @@ -196,18 +196,4 @@ $(function() }); return false; }); - - $.extend({'closeModal':function(callback, location) - { - var ref = $('#triggerModal.modal').attr('ref'); - if(ref.indexOf('export') > 0 && ref.indexOf('kanban') > 0) - { - $('#triggerModal').modal('hide'); - } - else - { - kanbanModalTrigger.close(); - } - if(callback && $.isFunction(callback)) callback(); - }}); }); diff --git a/module/task/control.php b/module/task/control.php index e96e10334a..137e277a90 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -239,7 +239,7 @@ class task extends control if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); /* Locate the browser. */ - if(!empty($iframe)) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true)); + if(!empty($iframe)) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $storyLink)); }