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

* Fix bug #37039.

Browse Source
This commit is contained in:
zhaoke
2023-08-08 15:36:54 +08:00
parent 6d58023f75
commit cbade64264
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+1 -1
View File
@@ -561,7 +561,7 @@ class bugModel extends model
$bug = $this->loadModel('file')->replaceImgURL($bug, 'steps');
if($setImgSize) $bug->steps = $this->file->setImgSize($bug->steps);
foreach($bug as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $bug->$key = '';
foreach($bug as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr(is_null($value) ? '' : $value, 0, 4)) $bug->$key = '';
if($bug->duplicateBug) $bug->duplicateBugTitle = $this->dao->findById($bug->duplicateBug)->from(TABLE_BUG)->fields('title')->fetch('title');
if($bug->case) $bug->caseTitle = $this->dao->findById($bug->case)->from(TABLE_CASE)->fields('title')->fetch('title');
module/mr/config/dtable.php
+1 -1
View File
@@ -62,7 +62,7 @@ $config->mr->taskDtable->fieldList['name']['flex'] = '';
$config->mr->taskDtable->fieldList['name']['type'] = 'nestedTitle';
$config->mr->taskDtable->fieldList['name']['nestedToggle'] = true;
$config->mr->taskDtable->fieldList['name']['sortType'] = true;
$config->mr->taskDtable->fieldList['name']['link'] = array('module' => 'task', 'method' => 'view', 'params' => 'taskID={id}');
$config->mr->taskDtable->fieldList['name']['link'] = array('module' => 'task', 'method' => 'view', 'params' => 'taskID={id}', 'target' => '_blank');
$config->mr->taskDtable->fieldList['name']['required'] = true;
$config->mr->taskDtable->fieldList['pri']['title'] = $lang->priAB;
module/mr/ui/link.html.php
+11 -3
View File
@@ -23,17 +23,25 @@ $actionMenu['list']['unlink']['hint'] = $lang->productplan->unlinkStory;
$actionMenu['list']['unlink']['className'] = 'ajax-submit';
$storyCols = $config->release->dtable->story->fieldList;
$storyCols['actions'] = $actionMenu;
$storyCols['actions'] = $actionMenu;
$storyCols['id']['checkbox'] = false;
$storyCols['title']['data-toggle'] = '';
$storyCols['title']['nestedToggle'] = false;
$storyCols['title']['link'] = array('module' => 'story', 'method' => 'view', 'params' => 'storyID={id}', 'target' => '_blank');
$storyCols['actions']['list']['unlink']['data-confirm'] = $lang->productplan->confirmUnlinkStory;
$storyCols['actions']['list']['unlink']['url'] = $this->createLink('mr', 'unlink', "MRID=$MR->id&productID=$product->id&type=story&linkID={id}&confirm=yes");
$storyCols['id']['checkbox'] = false;
$stories = initTableData($stories, $storyCols);
$bugCols = $config->release->dtable->bug->fieldList;
$bugCols['actions'] = $actionMenu;
$bugCols['actions']['list']['unlink']['data-confirm'] = $lang->productplan->confirmUnlinkBug;
$bugCols['actions']['list']['unlink']['url'] = $this->createLink('mr', 'unlink', "MRID=$MR->id&productID=$product->id&type=bug&linkID={id}&confirm=yes");
$bugCols['id']['checkbox'] = false;
$bugCols['id']['checkbox'] = false;
$bugCols['title']['data-toggle'] = '';
$bugCols['title']['link'] = array('module' => 'bug', 'method' => 'view', 'params' => 'bugID={id}', 'target' => '_blank');
$bugs = initTableData($bugs, $bugCols);
$taskCols = $config->mr->taskDtable->fieldList;
module/story/model.php
+4 -4
View File
@@ -87,10 +87,10 @@ class storyModel extends model
if($story->parent == '-1') $story->children = $this->dao->select('*')->from(TABLE_STORY)->where('parent')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll('id');
$story->openedDate = substr($story->openedDate, 0, 19);
$story->assignedDate = substr($story->assignedDate, 0, 19);
$story->reviewedDate = substr($story->reviewedDate, 0, 19);
$story->closedDate = substr($story->closedDate, 0, 19);
$story->lastEditedDate= substr($story->lastEditedDate, 0, 19);
$story->assignedDate = substr(is_null($story->assignedDate) ? '' : $story->assignedDate, 0, 19);
$story->reviewedDate = substr(is_null($story->reviewedDate) ? '' : $story->reviewedDate, 0, 19);
$story->closedDate = substr(is_null($story->closedDate) ? '' : $story->closedDate, 0, 19);
$story->lastEditedDate= substr(is_null($story->lastEditedDate) ? '' : $story->lastEditedDate, 0, 19);
return $story;
}
module/testcase/model.php
+1 -1
View File
@@ -461,7 +461,7 @@ class testcaseModel extends model
{
$case = $this->dao->findById($caseID)->from(TABLE_CASE)->fetch();
if(!$case) return false;
foreach($case as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $case->$key = '';
foreach($case as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr(is_null($value) ? '' : $value, 0, 4)) $case->$key = '';
/* Get project and execution. */
if($this->app->tab == 'project')