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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport

Browse Source
This commit is contained in:
tanghucheng
2022-07-26 17:24:48 +08:00
parent be483be25b ba89545efb
commit 08bb4143fe
75 changed files with 597 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+1 -1
View File
@@ -230,7 +230,7 @@ class task extends control
elseif($this->post->after == 'toTaskList')
{
setcookie('moduleBrowseParam', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
$taskLink = $this->createLink('execution', 'task', "executionID=$executionID&status=unclosed&param=0&orderBy=id_desc");
$taskLink = $this->createLink('execution', 'task', "executionID=$executionID&status=all&param=0&orderBy=id_desc");
$response['locate'] = $taskLink;
return $this->send($response);
}
module/task/css/create.css
-1
View File
@@ -22,6 +22,5 @@
.c-multipleTask {width: 110px;}
.c-modulel {width: 110px;}
.c-selectStory {width: 120px;}
.keep-row-height {height: 32px;}
module/task/model.php
+1 -1
View File
@@ -1673,7 +1673,7 @@ class taskModel extends model
$estimate->left = zget($_POST, 'left', 0);
$estimate->work = zget($task, 'work', '');
$estimate->account = $this->app->user->account;
$estimate->consumed = $estimate->consumed - $oldTask->consumed;
$estimate->consumed = !empty($oldTask->team) ? $estimate->consumed - $oldTask->team[$this->app->user->account]->consumed : $estimate->consumed - $oldTask->consumed;
if($this->post->comment) $estimate->work = $this->post->comment;
$this->addTaskEstimate($estimate);
module/task/view/view.html.php
+2 -2
View File
@@ -166,8 +166,8 @@
<?php endif;?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php if(!isonlybody()):?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
<?php if(!isonlybody() and $this->app->getViewType() != 'xhtml'):?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn'");?>
<?php echo "<div class='divider'></div>";?>
<?php endif;?>
<?php $task->executionList = $execution;?>