Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix error of todo::delete.

Browse Source
This commit is contained in:
liumengyi
2023-06-16 19:27:31 +08:00
parent bbe6c41e60
commit b953d96887
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/config/table.php
+1 -1
View File
@@ -48,7 +48,7 @@ $config->my->todo->actionList['edit']['data-toggle'] = 'modal';
$config->my->todo->actionList['delete']['icon'] = 'trash';
$config->my->todo->actionList['delete']['text'] = $lang->todo->delete;
$config->my->todo->actionList['delete']['hint'] = $lang->todo->delete;
$config->my->todo->actionList['delete']['url'] = array('module' => 'todo', 'method' => 'delete', 'params' => 'todoID={id}&confirm=yes');
$config->my->todo->actionList['delete']['url'] = array('module' => 'todo', 'method' => 'delete', 'params' => 'todoID={id}&confirm=no');
$config->my->todo->dtable = new stdclass();
$config->my->todo->dtable->fieldList['id']['name'] = 'id';
module/todo/control.php
+4 -6
View File
@@ -322,13 +322,13 @@ class todo extends control
*/
public function delete(int $todoID, string $confirm = 'no')
{
if($confirm == 'no') return print(js::confirm($this->lang->todo->confirmDelete, $this->createLink('todo', 'delete', "todoID={$todoID}&confirm=yes")));
if($confirm == 'no') return $this->send(array('result' => 'success', 'load' => array('confirm' => $this->lang->todo->confirmDelete, 'confirmed' => $this->createLink('todo', 'delete', "todoID={$todoID}&confirm=yes"), 'canceled' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo'))));
$this->todo->delete(TABLE_TODO, $todoID);
if(helper::isAjaxRequest())
{
$response = array('result' => 'success', 'message' => '');
$response = array('result' => 'success', 'message' => '', 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo'));
if(dao::isError())
{
$response['result'] = 'fail';
@@ -338,10 +338,8 @@ class todo extends control
}
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
if(isonlybody()) return print(js::reload('parent.parent'));
$browseLink = $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo');
return print(js::locate($browseLink, 'parent'));
if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
}
/**