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 tsj_fixbug

Browse Source
This commit is contained in:
tianshujie
2023-04-20 15:29:33 +08:00
parent 205327d891 1d45e86bda
commit 32686d7132
13 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update18.3.sql
+1 -1
View File
@@ -717,7 +717,7 @@ CHANGE `pri` `pri` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `assignedTo` `assignedTo` text NULL,
CHANGE `desc` `desc` mediumtext NULL,
CHANGE `estimate` `estimate` float unsigned NOT NULL DEFAULT '0',
CHANGE `color` `color` char(7) NOT NULL DEFAULT '';
CHANGE `color` `color` char(7) NOT NULL DEFAULT '',
CHANGE `fromID` `fromID` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `fromType` `fromType` varchar(30) NOT NULL DEFAULT '',
CHANGE `whitelist` `whitelist` text NULL,
module/dimension/config.php
+4 -4
View File
@@ -89,11 +89,11 @@ $config->dimension->chartUpgrade['macro']['project']['story'] = array('chart
$config->dimension->chartUpgrade['efficiency'] = array();
$config->dimension->chartUpgrade['efficiency']['staff'] = array();
$config->dimension->chartUpgrade['efficiency']['staff']['project'] = array('chart' => '10000,10001,10002,10101,10103,10105,10107');
$config->dimension->chartUpgrade['efficiency']['staff']['execution'] = array('chart' => '10007,10008,10009,10102,10104,10106,10107');
$config->dimension->chartUpgrade['efficiency']['staff']['execution'] = array('chart' => '10007,10008,10009,10102,10104,10106,10108');
$config->dimension->chartUpgrade['efficiency']['staff']['release'] = array('chart' => '10005');
$config->dimension->chartUpgrade['efficiency']['staff']['story'] = array('chart' => '10003,10004,10109,10111');
$config->dimension->chartUpgrade['efficiency']['staff']['task'] = array('chart' => '10010,10110');
$config->dimension->chartUpgrade['efficiency']['staff']['bug'] = array('chart' => '1070');
$config->dimension->chartUpgrade['efficiency']['staff']['bug'] = array('chart' => '10006');
$config->dimension->chartUpgrade['efficiency']['staff']['cost'] = array('chart' => '10011,10012,10013,10112,10113');
$config->dimension->chartUpgrade['efficiency']['project'] = array();
@@ -108,8 +108,8 @@ $config->dimension->chartUpgrade['quality']['staff']['bug'] = array('chart'
$config->dimension->chartUpgrade['quality']['staff']['testcase'] = array('chart' => '10203');
$config->dimension->chartUpgrade['quality']['test'] = array();
$config->dimension->chartUpgrade['quality']['test']['bug'] = array('chart' => '10209,10210,1014,10211,10219,10212,10218,10214,10220,10213,10216');
$config->dimension->chartUpgrade['quality']['test']['testcase'] = array('chart' => '10208,10215');
$config->dimension->chartUpgrade['quality']['test']['bug'] = array('chart' => '10209,10210,10217,10211,10219,10212,10218,10214,10220,10213,10216');
$config->dimension->chartUpgrade['quality']['test']['testcase'] = array('chart' => '10207,10208,10215');
$config->dimension->secondModuleList = array();
$config->dimension->secondModuleList['macro'] = array('pivot' => $config->dimension->pivotModuleList['macro'], 'pivotUpgrade' => $config->dimension->pivotUpgrade['macro'], 'chart' => $config->dimension->chartModuleList['macro'], 'chartUpgrade' => $config->dimension->chartUpgrade['macro']);
module/dimension/lang/de.php
+1 -1
View File
@@ -17,7 +17,7 @@ $lang->dimension->modules['product'] = $lang->productCommon;
$lang->dimension->modules['plan'] = 'Plan';
$lang->dimension->modules['execution'] = $lang->executionCommon;
$lang->dimension->modules['release'] = $lang->release->common;
$lang->dimension->modules['story'] = $lang->SRCommon;
$lang->dimension->modules['story'] = 'Story';
$lang->dimension->modules['task'] = $lang->task->common;
$lang->dimension->modules['bug'] = $lang->bug->common;
$lang->dimension->modules['doc'] = $lang->doc->common;
module/dimension/lang/en.php
+1 -1
View File
@@ -17,7 +17,7 @@ $lang->dimension->modules['product'] = $lang->productCommon;
$lang->dimension->modules['plan'] = 'Plan';
$lang->dimension->modules['execution'] = $lang->executionCommon;
$lang->dimension->modules['release'] = $lang->release->common;
$lang->dimension->modules['story'] = $lang->SRCommon;
$lang->dimension->modules['story'] = 'Story';
$lang->dimension->modules['task'] = $lang->task->common;
$lang->dimension->modules['bug'] = $lang->bug->common;
$lang->dimension->modules['doc'] = $lang->doc->common;
module/dimension/lang/fr.php
+1 -1
View File
@@ -17,7 +17,7 @@ $lang->dimension->modules['product'] = $lang->productCommon;
$lang->dimension->modules['plan'] = 'Plan';
$lang->dimension->modules['execution'] = $lang->executionCommon;
$lang->dimension->modules['release'] = $lang->release->common;
$lang->dimension->modules['story'] = $lang->SRCommon;
$lang->dimension->modules['story'] = 'Story';
$lang->dimension->modules['task'] = $lang->task->common;
$lang->dimension->modules['bug'] = $lang->bug->common;
$lang->dimension->modules['doc'] = $lang->doc->common;
module/dimension/lang/zh-cn.php
+1 -1
View File
@@ -17,7 +17,7 @@ $lang->dimension->modules['product'] = $lang->productCommon;
$lang->dimension->modules['plan'] = '计划';
$lang->dimension->modules['execution'] = $lang->executionCommon;
$lang->dimension->modules['release'] = $lang->release->common;
$lang->dimension->modules['story'] = $lang->SRCommon;
$lang->dimension->modules['story'] = '需求';
$lang->dimension->modules['task'] = $lang->task->common;
$lang->dimension->modules['bug'] = $lang->bug->common;
$lang->dimension->modules['doc'] = $lang->doc->common;
module/doc/control.php
+1 -1
View File
@@ -1122,7 +1122,7 @@ class doc extends control
*/
public function view($docID = 0, $version = 0, $appendLib = 0)
{
$doc = $this->doc->getById($docID);
$doc = $this->doc->getById($docID, $version, true);
if(!$this->doc->checkPrivDoc($doc))
{
echo(js::alert($this->lang->doc->accessDenied));
module/doc/css/view.css
+1 -2
View File
@@ -30,10 +30,9 @@
.article-content.comment .comment-content {width: 94%;}
#outlineMenu {max-width: 200px; overflow-x: auto;}
#outlineMenu .tree li > a {text-overflow: clip;}
.outline-toggle {position: absolute; right: 20px; top: 50px;}
.outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
.outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}
.outline-toggle {position: absolute; right: 55px; top: 50px; background: #fff;}
.outline-toggle {position: absolute; right: 15px; top: 50px; background: #fff; padding: 5px 20px 5px 15px;}
.outline ul li {list-style: none;}
.outline-content {display: none; padding-top: 18px;}
.outline-content a {color: #838A9D;}
module/doc/view/content.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
<li class="drop-title flex-between dropdown-header not-clear-menu"><div><?php echo $lang->doc->allVersion?></div></li>
<div class="drop-body menu-active-primary menu-hover-primary">
<?php for($itemVersion = $doc->version; $itemVersion > 0; $itemVersion--):?>
<li class="li-item <?php if($itemVersion == $version) echo 'active';?>"><div class="checkbox-primary"><input type="checkbox" <?php echo "data-id=".$doc->id." data-version=".$itemVersion;?> ></input><label for=""></label></div><a href='javascript:void(0)' data-url='<?php echo $this->createLink('doc', 'view', "docID=$doc->id&version=$itemVersion"); ?>'>#<?php echo $itemVersion;?></a></li>
<li class="li-item <?php if($itemVersion == $version) echo 'active';?>"><div class="checkbox-primary"><input type="checkbox" <?php echo "data-id=".$doc->id." data-version=".$itemVersion;?> ></input><label for=""></label></div><a href='javascript:void(0)' data-url='<?php echo $this->createLink('doc', 'view', "docID=$doc->id&version=$itemVersion"); ?>'>V<?php echo $itemVersion;?></a></li>
<?php endfor;?>
</div>
<li class="drop-bottom"><button data-id="confirm" class="btn btn-primary"><?php echo $lang->confirm?></button><button data-id="cancel" class="btn"><?php echo $lang->doc->cancelDiff?></button></li>
module/task/model.php
+7 -7
View File
@@ -524,8 +524,8 @@ class taskModel extends model
if($oldParentTask->parent == 0 and $oldParentTask->consumed > 0)
{
$clonedTask = clone $oldParentTask;
unset($clonedTask->id);
$clonedTask->parent = $parentID;
unset($clonedTask->id);
$this->dao->insert(TABLE_TASK)->data($clonedTask)->autoCheck()->exec();
$clonedTaskID = $this->dao->lastInsertID();
@@ -641,14 +641,14 @@ class taskModel extends model
$tasks = $this->dao->select('estStarted, realStarted, deadline')->from(TABLE_TASK)->where('parent')->eq($taskID)->andWhere('status')->ne('cancel')->andWhere('deleted')->eq(0)->fetchAll();
if(empty($tasks)) return true;
$earliestEstStarted = '';
$earliestRealStarted = '';
$latestDeadline = '';
foreach($tasks as $task)
{
$estStarted = formatTime($task->estStarted);
$realStarted = formatTime($task->realStarted);
$deadline = formatTime($task->deadline);
if(!isset($earliestEstStarted) or (!empty($estStarted) and $earliestEstStarted > $estStarted)) $earliestEstStarted = $estStarted;
if(!isset($earliestRealStarted) or (!empty($realStarted) and $earliestRealStarted > $realStarted)) $earliestRealStarted = $realStarted;
if(!isset($latestDeadline) or (!empty($deadline) and $latestDeadline < $deadline)) $latestDeadline = $deadline;
if(!helper::isZeroDate($task->estStarted) and (empty($earliestEstStarted) or $earliestEstStarted > $task->estStarted)) $earliestEstStarted = $task->estStarted;
if(!helper::isZeroDate($task->realStarted) and (empty($earliestRealStarted) or $earliestRealStarted > $task->realStarted)) $earliestRealStarted = $task->realStarted;
if(!helper::isZeroDate($task->deadline) and (empty($latestDeadline) or $latestDeadline < $task->deadline)) $latestDeadline = $task->deadline;
}
$newTask = new stdClass();
module/testtask/control.php
-1
View File
@@ -1114,7 +1114,6 @@ class testtask extends control
$this->config->testcase->search['params']['scene']['values'] = $this->testcase->getSceneMenu($productID, 0, $viewType = 'case', $startSceneID = 0, 0);
$this->config->testcase->search['style'] = 'simple';
$build = $this->loadModel('build')->getByID($task->build);
$stories = array();
if($build)
module/testtask/model.php
+2 -2
View File
@@ -389,7 +389,7 @@ class testtaskModel extends model
public function getAllLinkableCases($task, $query, $linkedCases, $pager)
{
return $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('id')->notIN($linkedCases)
->beginIF(!empty($linkedCases))->andWhere('id')->notIN($linkedCases)->fi()
->andWhere('status')->ne('wait')
->andWhere('type')->ne('unit')
->beginIF($task->branch !== '')->andWhere('branch')->in("0,$task->branch")->fi()
@@ -423,7 +423,7 @@ class testtaskModel extends model
->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
->andWhere('t1.product')->eq($productID)
->andWhere('t1.status')->ne('wait')
->beginIF($linkedCases)->andWhere('t1.id')->notIN($linkedCases)->fi()
->beginIF(!empty($linkedCases))->andWhere('t1.id')->notIN($linkedCases)->fi()
->beginIF($task->branch !== '')->andWhere('t1.branch')->in("0,$task->branch")->fi()
->andWhere('t1.story')->in(trim($stories, ','))
->andWhere('t1.deleted')->eq(0)
module/upgrade/model.php
+1 -1
View File
@@ -8970,7 +8970,7 @@ class upgradeModel extends model
{
$reports = $this->dao->select('*')->from(TABLE_REPORT)->fetchAll();
$groupCollectors = $this->dao->select('collector, id')->from(TABLE_MODULE)->where('type')->eq('pivot')->fetchPairs();
$groupCollectors = $this->dao->select('collector, id')->from(TABLE_MODULE)->where('type')->eq('pivot')->andWhere('root')->eq(1)->fetchPairs();
$this->loadModel('pivot');