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

* Fix error of todo::edit.

Browse Source
This commit is contained in:
liumengyi
2023-06-16 16:05:25 +08:00
parent 7ab3c360c7
commit 2d7743a6fb
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/control.php
+3 -11
View File
@@ -126,25 +126,17 @@ class todo extends control
/* Processing edit request data. */
$todo = $this->todoZen->beforeEdit($todoID, $form);
if(dao::isError())
{
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => dao::getError()));
return print(js::error(dao::getError()));
}
if(dao::isError()) return $this->send(array('status' => 'fail', 'message' => dao::getError()));
/* update a todo. */
$changes = $this->todo->update($todoID, $todo);
if(dao::isError())
{
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => dao::getError()));
return print(js::error(dao::getError()));
}
if(dao::isError()) return $this->send(array('status' => 'fail', 'message' => dao::getError()));
/* Handle data after edit todo. */
$this->todoZen->afterEdit($todoID, $changes);
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
return print(js::locate($this->session->todoList, 'parent.parent'));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
}
/* Judge a private todo or not, If private, die. */
module/todo/ui/create.html.php
+1 -3
View File
@@ -35,8 +35,6 @@ $cycleTypeOptions = array(
$days = array();
for($day = 1; $day <= 31; $day ++) $days[$day] = $day . $lang->todo->day;
$isInModal = isAjaxRequest('modal');
formPanel
(
set::title(''),
@@ -600,4 +598,4 @@ formPanel
)
);
render($isInModal ? 'modalDialog' : 'page');
render(isAjaxRequest('modal') ? 'modalDialog' : 'page');
module/todo/ui/edit.html.php
+1 -1
View File
@@ -769,4 +769,4 @@ formPanel
)
);
render();
render(isAjaxRequest('modal') ? 'modalDialog' : 'page');