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

* Adjust code style.

Browse Source
This commit is contained in:
tianshujie98
2020-12-11 15:45:03 +08:00
parent 38867fc96c
commit dabb2d003d
7 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+4 -3
View File
@@ -157,7 +157,7 @@ class task extends control
elseif($this->post->after == 'toTaskList')
{
setcookie('moduleBrowseParam', 0, 0, $this->config->webRoot, '', false, false);
$taskLink = $this->createLink('project', 'task', "projectID=$projectID&status=bymodule&param=$moduleID&orderBy=id_desc");
$taskLink = $this->createLink('project', 'task', "projectID=$projectID&status=unclosed&param=0&orderBy=id_desc");
$response['locate'] = $taskLink;
$this->send($response);
}
@@ -1028,9 +1028,10 @@ class task extends control
if(dao::isError()) die(js::error(dao::getError()));
if(!empty($changes))
if($this->post->comment != '' or !empty($changes))
{
$actionID = $this->action->create('task', $taskID, 'Closed', $this->post->comment);
$action = (!empty($changes)) ? 'Closed' : 'Commented';
$actionID = $this->action->create('task', $taskID, $action, $this->post->comment);
$this->action->logHistory($actionID, $changes);
}
module/task/model.php
+2 -2
View File
@@ -1677,12 +1677,12 @@ class taskModel extends model
*
* @param int $taskID
* @access public
* @return void
* @return array
*/
public function close($taskID)
{
$oldTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch();
if($oldTask->status == 'closed') return;
if($oldTask->status == 'closed') return array();
$now = helper::now();
$task = fixer::input('post')
module/task/view/finish.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
</tr>
<tr>
<th><?php echo $lang->task->realStarted;?></th>
<td><div class='datepicker-wrapper'><?php echo html::input('realStarted', $task->realStarted != '0000-00-00' ? $task->realStarted : '', "class='form-control form-datetime'");?></div></td><td></td>
<td><div class='datepicker-wrapper'><?php echo html::input('realStarted', $task->realStarted != '0000-00-00 00:00:00' ? $task->realStarted : '', "class='form-control form-datetime'");?></div></td><td></td>
</tr>
<tr>
<th><?php echo $lang->task->finishedDate;?></th>