From 624d748ba41b5fd44b3993f6b911dee33d73063b Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Wed, 8 Nov 2023 22:17:19 -0500 Subject: [PATCH] * Merge #ffd2b525c8,Change judgment condition. --- module/block/view/contribute.html.php | 2 +- module/block/zen.php | 16 ++++++++-------- module/bug/model.php | 4 ++-- module/bug/zen.php | 4 ++-- module/common/model.php | 2 +- module/install/model.php | 2 +- module/personnel/model.php | 4 ++-- module/personnel/ui/invest.html.php | 6 +++--- module/personnel/view/invest.html.php | 6 +++--- module/search/model.php | 13 +++++++------ module/task/model.php | 2 +- 11 files changed, 31 insertions(+), 30 deletions(-) diff --git a/module/block/view/contribute.html.php b/module/block/view/contribute.html.php index 58afbe9e9d..43c923d63e 100644 --- a/module/block/view/contribute.html.php +++ b/module/block/view/contribute.html.php @@ -32,7 +32,7 @@
block->createdCases;?>
createLink('my', 'contribute', 'mode=testcase&type=openedbyme'), (int)$data['createdCases']);?>
- config->edition == 'max'):?> + config->edition == 'max' or $this->config->edition == 'ipd'):?>
block->createdRisks;?>
diff --git a/module/block/zen.php b/module/block/zen.php index 78c5789ab6..a2e5b2d71d 100644 --- a/module/block/zen.php +++ b/module/block/zen.php @@ -894,7 +894,7 @@ class blockZen extends block $count = isset($block->params->count) ? (int)$block->params->count : 15; /* Get projects. */ - $excludedModel = $this->config->edition == 'max' ? '' : 'waterfall'; + $excludedModel = ($this->config->edition == 'max' or $this->config->edition == 'ipd') ? '' : 'waterfall'; $projects = $this->loadModel('project')->getProjectList($status, 'order_asc', $count, $excludedModel); $projectIdList = array_keys($projects); @@ -2010,7 +2010,7 @@ class blockZen extends block $hasViewPriv['review'] = true; $count['review'] = count($reviews); $this->view->reviews = $reviews; - if($this->config->edition == 'max') + if($this->config->edition == 'max' or $this->config->edition == 'ipd') { $this->app->loadLang('approval'); $this->view->flows = $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('buildin')->eq(0)->fetchPairs('module', 'name'); @@ -2024,14 +2024,14 @@ class blockZen extends block if(common::hasPriv('bug', 'view') && $this->config->vision != 'lite') $hasViewPriv['bug'] = true; if(common::hasPriv('testcase', 'view') && $this->config->vision != 'lite') $hasViewPriv['testcase'] = true; if(common::hasPriv('testtask', 'cases') && $this->config->vision != 'lite') $hasViewPriv['testtask'] = true; - if(common::hasPriv('risk', 'view') && $this->config->edition == 'max' && $this->config->vision != 'lite' && $hasRisk) $hasViewPriv['risk'] = true; - if(common::hasPriv('issue', 'view') && $this->config->edition == 'max' && $this->config->vision != 'lite' && $hasIssue) $hasViewPriv['issue'] = true; - if(common::hasPriv('meeting', 'view') && $this->config->edition == 'max' && $this->config->vision != 'lite' && $hasMeeting) $hasViewPriv['meeting'] = true; - if(common::hasPriv('feedback', 'view') && in_array($this->config->edition, array('max', 'biz'))) $hasViewPriv['feedback'] = true; - if(common::hasPriv('ticket', 'view') && in_array($this->config->edition, array('max', 'biz'))) $hasViewPriv['ticket'] = true; + if(common::hasPriv('risk', 'view') && in_array($this->config->edition, array('max', 'ipd')) && $this->config->vision != 'lite' && $hasRisk) $hasViewPriv['risk'] = true; + if(common::hasPriv('issue', 'view') && in_array($this->config->edition, array('max', 'ipd')) && $this->config->vision != 'lite' && $hasIssue) $hasViewPriv['issue'] = true; + if(common::hasPriv('meeting', 'view') && in_array($this->config->edition, array('max', 'ipd')) && $this->config->vision != 'lite' && $hasMeeting) $hasViewPriv['meeting'] = true; + if(common::hasPriv('feedback', 'view') && in_array($this->config->edition, array('max', 'biz', 'ipd'))) $hasViewPriv['feedback'] = true; + if(common::hasPriv('ticket', 'view') && in_array($this->config->edition, array('max', 'biz', 'ipd'))) $hasViewPriv['ticket'] = true; $objectList = array('todo' => 'todos', 'task' => 'tasks', 'bug' => 'bugs', 'story' => 'stories', 'requirement' => 'requirements'); - if($this->config->edition == 'max') + if($this->config->edition == 'max' or $this->config->edition == 'ipd') { if($hasRisk) $objectList += array('risk' => 'risks'); if($hasIssue) $objectList += array('issue' => 'issues'); diff --git a/module/bug/model.php b/module/bug/model.php index 4fb1859446..84b602c4f2 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -434,7 +434,7 @@ class bugModel extends model if($changes) $this->action->logHistory($actionID, $changes); /* If the edition is not pms, update feedback. */ - if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status); + if($this->config->edition != 'open' && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status); return !dao::isError(); } @@ -559,7 +559,7 @@ class bugModel extends model $this->dao->update(TABLE_BUG)->data($bug, 'comment')->autoCheck()->checkFlow()->where('id')->eq($bug->id)->exec(); if(dao::isError()) return false; - if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status); + if($this->config->edition != 'open' && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status); $changes = common::createChanges($oldBug, $bug); $actionID = $this->loadModel('action')->create('bug', $bug->id, 'Closed', $bug->comment); diff --git a/module/bug/zen.php b/module/bug/zen.php index e5a293acf4..68b1e7c1d7 100644 --- a/module/bug/zen.php +++ b/module/bug/zen.php @@ -1890,7 +1890,7 @@ class bugZen extends bug { $this->dao->update(TABLE_TODO)->set('status')->eq('done')->where('id')->eq($todoID)->exec(); $this->action->create('todo', $todoID, 'finished', '', "BUG:$bugID"); - if($this->config->edition == 'biz' || $this->config->edition == 'max') + if($this->config->edition != 'open') { $todo = $this->dao->select('type, objectID')->from(TABLE_TODO)->where('id')->eq($todoID)->fetch(); if($todo->type == 'feedback' && $todo->objectID) $this->loadModel('feedback')->updateStatus('todo', $todo->objectID, 'done'); @@ -2270,7 +2270,7 @@ class bugZen extends bug /* 更新相关反馈的状态。*/ /* Update status of related feedback. */ - if($this->config->edition != 'pms' && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status); + if($this->config->edition != 'open' && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status); } /** diff --git a/module/common/model.php b/module/common/model.php index 0294d5b870..adf5aaeea0 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -292,7 +292,7 @@ class commonModel extends model public function setApproval() { $this->config->openedApproval = false; - if($this->config->edition == 'max' && $this->config->vision == 'rnd') $this->config->openedApproval = true; + if(($this->config->edition == 'max' or $this->config->edition == 'ipd') && $this->config->vision == 'rnd') $this->config->openedApproval = true; } /** diff --git a/module/install/model.php b/module/install/model.php index 6426a76193..6574dcc833 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -560,7 +560,7 @@ class installModel extends model } } - if($this->config->edition == 'max') + if($this->config->edition == 'max' or $this->config->edition == 'ipd') { /* Update process by lang. */ foreach($this->lang->install->processList as $id => $name) diff --git a/module/personnel/model.php b/module/personnel/model.php index b77a165503..bc94d7a757 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -133,7 +133,7 @@ class personnelModel extends model $executionPairs = $this->getInvolvedExecutions($projects); $taskInvest = $this->getProjectTaskInvest($projects, $accountPairs); $bugAndStoryInvest = $this->getBugAndStoryInvest($accountPairs, $programID); - if($this->config->edition == 'max') + if($this->config->edition == 'max' or $this->config->edition == 'ipd') { $issueInvest = $this->getIssueInvest($accountPairs, $projects); $riskInvest = $this->getRiskInvest($accountPairs, $projects); @@ -156,7 +156,7 @@ class personnelModel extends model $personnelList[$user->role][$account] += $taskInvest[$account]; $personnelList[$user->role][$account] += $bugAndStoryInvest[$account]; - if($this->config->edition == 'max') + if($this->config->edition == 'max' or $this->config->edition == 'ipd') { $personnelList[$user->role][$account] += $issueInvest[$account]; $personnelList[$user->role][$account] += $riskInvest[$account]; diff --git a/module/personnel/ui/invest.html.php b/module/personnel/ui/invest.html.php index 5b57fe0083..65ffd388db 100644 --- a/module/personnel/ui/invest.html.php +++ b/module/personnel/ui/invest.html.php @@ -25,7 +25,7 @@ dropmenu(); personnel->task;?> personnel->bug;?> URAndSR ? "colspan='2'" : "rowspan='2'";?> class="c-story">personnel->createStories;?> - config->edition == 'max'): ?> + config->edition == 'max' or $this->config->edition == 'ipd'): ?> personnel->issue;?> personnel->risk;?> @@ -43,7 +43,7 @@ dropmenu(); personnel->UR;?> personnel->SR;?> - config->edition == 'max'): ?> + config->edition == 'max' or $this->config->edition == 'ipd'): ?> personnel->created;?> personnel->resolved;?> personnel->wait;?> @@ -73,7 +73,7 @@ dropmenu(); - config->edition == 'max'): ?> + config->edition == 'max' or $this->config->edition == 'ipd'): ?> diff --git a/module/personnel/view/invest.html.php b/module/personnel/view/invest.html.php index 2c3e7b6f2d..ddab49b313 100644 --- a/module/personnel/view/invest.html.php +++ b/module/personnel/view/invest.html.php @@ -29,7 +29,7 @@ personnel->task;?> personnel->bug;?> URAndSR ? "colspan='2'" : "rowspan='2'";?> class="c-story">personnel->createStories;?> - config->edition == 'max'): ?> + config->edition == 'max' or $this->config->edition == 'ipd'): ?> personnel->issue;?> personnel->risk;?> @@ -47,7 +47,7 @@ personnel->UR;?> personnel->SR;?> - config->edition == 'max'): ?> + config->edition == 'max' or $this->config->edition == 'ipd'): ?> personnel->created;?> personnel->resolved;?> personnel->wait;?> @@ -77,7 +77,7 @@ - config->edition == 'max'): ?> + config->edition == 'max' or $this->config->edition == 'ipd'): ?> diff --git a/module/search/model.php b/module/search/model.php index fd2cdaab45..928d576f46 100644 --- a/module/search/model.php +++ b/module/search/model.php @@ -822,12 +822,13 @@ class searchModel extends model $table = $this->config->objectTables[$module]; $fields = ''; - if($module == 'issue') $fields = $this->config->edition == 'max' ? 'id,project,owner,lib' : 'id,project,owner'; + if($module == 'issue') $fields = ($this->config->edition == 'max' or $this->config->edition == 'ipd') ? 'id,project,owner,lib' : 'id,project,owner'; if($module == 'project') $fields = 'id,model'; if($module == 'execution')$fields = 'id,type,project'; - if($module == 'story' or $module == 'requirement') $fields = $this->config->edition == 'max' ? 'id,type,lib' : 'id,type'; - if(($module == 'risk' or $module == 'opportunity') and $this->config->edition == 'max') $fields = 'id,lib'; - if($module == 'doc' and $this->config->edition == 'max') $fields = 'id,assetLib,assetLibType'; + if($module == 'story' or $module == 'requirement') $fields = ($this->config->edition == 'max' or $this->config->edition == 'ipd') ? 'id,type,lib' : 'id,type'; + if(($module == 'risk' or $module == 'opportunity') and ($this->config->edition == 'max' or $this->config->edition == 'ipd')) $fields = 'id,lib'; + if($module == 'doc' and ($this->config->edition == 'max' or $this->config->edition == 'ipd')) $fields = 'id,assetLib,assetLibType'; + if(empty($fields)) continue; $objectList[$module] = $this->dao->select($fields)->from($table)->where('id')->in($idList)->fetchAll('id'); @@ -894,7 +895,7 @@ class searchModel extends model $record->extraType = isset($story->type) ? $story->type : ''; } - elseif(($module == 'risk' or $module == 'opportunity') and $this->config->edition == 'max') + elseif(($module == 'risk' or $module == 'opportunity') and ($this->config->edition == 'max' or $this->config->edition == 'ipd')) { $object = $objectList[$module][$record->objectID]; if(!empty($object->lib)) @@ -905,7 +906,7 @@ class searchModel extends model $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true); } - elseif($module == 'doc' and $this->config->edition == 'max') + elseif($module == 'doc' and ($this->config->edition == 'max' or $this->config->edition == 'ipd')) { $doc = $objectList['doc'][$record->objectID]; if(!empty($doc->assetLib)) diff --git a/module/task/model.php b/module/task/model.php index e5c2fa8181..c219f6db55 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -3059,7 +3059,7 @@ class taskModel extends model /* Create action record. */ $this->taskTao->createUpdateParentTaskAction($oldParentTask); - if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $oldParentTask->feedback) $this->loadModel('feedback')->updateStatus('task', $oldParentTask->feedback, $status, $oldParentTask->status); + if($this->config->edition != 'open' && $oldParentTask->feedback) $this->loadModel('feedback')->updateStatus('task', $oldParentTask->feedback, $status, $oldParentTask->status); } /**