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

* Method renaming 'getPairs' to 'getExecutionPairs'.

Browse Source
This commit is contained in:
holan20180123
2020-11-19 16:14:04 +08:00
parent c5f8e7b2e4
commit 3f752243f6
13 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+2 -2
View File
@@ -124,7 +124,7 @@ class bug extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Get projects. */
$projects = $this->loadModel('project')->getPairs('empty|withdelete', $this->session->PRJ);
$projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'empty|withdelete');
/* Get bugs. */
$bugs = $this->bug->getBugs($productID, $projects, $branch, $browseType, $moduleID, $queryID, $sort, $pager);
@@ -1517,7 +1517,7 @@ class bug extends control
/* Get users, products and projects. */
$users = $this->loadModel('user')->getPairs('noletter');
$products = $this->loadModel('product')->getPairs('nocode', $this->session->PRJ);
$projects = $this->loadModel('project')->getPairs('all|nocode', $this->session->PRJ);
$projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'all|nocode');
/* Get related objects id lists. */
$relatedProductIdList = array();
module/bug/model.php
+1 -1
View File
@@ -1705,7 +1705,7 @@ class bugModel extends model
{
$datas = $this->dao->select('project as name, count(project) as value')->from(TABLE_BUG)->where($this->reportCondition())->groupBy('project')->orderBy('value DESC')->fetchAll('name');
if(!$datas) return array();
$projects = $this->loadModel('project')->getPairs('', $this->session->PRJ);
$projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ);
$maxLength = 12;
if(common::checkNotCN()) $maxLength = 22;
module/company/control.php
+1 -1
View File
@@ -191,7 +191,7 @@ class company extends control
$this->view->products = $products;
/* Get projects' list.*/
$projects = $this->loadModel('project')->getPairs('nocode');
$projects = $this->loadModel('project')->getExecutionPairs(0, 'all', 'nocode');
$projects = array($this->lang->company->project) + $projects;
$this->view->projects = $projects;
module/doc/model.php
+1 -1
View File
@@ -184,7 +184,7 @@ class docModel extends model
if(strpos($extra, 'withObject') !== false)
{
$products = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
$projects = $this->loadModel('project')->getPairs('', $this->session->PRJ);
$projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ);
}
$libPairs = array();
module/product/control.php
+1 -1
View File
@@ -636,7 +636,7 @@ class product extends control
{
if($productID == 0)
{
$projects = array(0 => '') + $this->loadModel('project')->getPairs();
$projects = array(0 => '') + $this->loadModel('project')->getExecutionPairs();
}
else
{
module/project/control.php
+1 -1
View File
@@ -2674,7 +2674,7 @@ class project extends control
$this->view->cases = $cases;
$this->view->story = $story;
$this->view->users = $users;
$this->view->projects = $this->loadModel('project')->getPairs('nocode', $this->session->PRJ);
$this->view->projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'nocode');
$this->view->actions = $this->loadModel('action')->getList('story', $storyID);
$this->view->modulePath = $modulePath;
$this->view->version = $version == 0 ? $story->version : $version;
module/report/control.php
+1 -1
View File
@@ -83,7 +83,7 @@ class report extends control
$this->view->end = $end;
$this->view->bugs = $this->report->getBugs($begin, $end, $product, $project);
$this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted');
$this->view->projects = array('' => '') + $this->loadModel('project')->getPairs('', $this->session->PRJ);
$this->view->projects = array('' => '') + $this->loadModel('project')->getExecutionPairs($this->session->PRJ);
$this->view->products = array('' => '') + $this->loadModel('product')->getPairs('', $this->session->PRJ);
$this->view->project = $project;
$this->view->product = $product;
module/search/model.php
+1 -1
View File
@@ -267,7 +267,7 @@ class searchModel extends model
$users['$@me'] = $this->lang->search->me;
}
if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs('', $this->session->PRJ);
if($hasProject) $projects = array('' => '') + $this->loadModel('project')->getPairs('', $this->session->PRJ);
if($hasProject) $projects = array('' => '') + $this->loadModel('project')->getExecutionPairs($this->session->PRJ);
foreach($fields as $fieldName)
{
module/story/control.php
+1 -1
View File
@@ -840,7 +840,7 @@ class story extends control
$this->view->track = $this->story->getTrackByID($story->id);
$this->view->users = $users;
$this->view->relations = $this->story->getStoryRelation($story->id, $story->type);
$this->view->projects = $this->loadModel('project')->getPairs('nocode');
$this->view->projects = $this->loadModel('project')->getExecutionPairs(0, 'all', 'nocode');
$this->view->program = $this->project->getByID($story->PRJ);
$this->view->actions = $this->action->getList('story', $storyID);
$this->view->storyModule = $storyModule;
module/task/control.php
+1 -1
View File
@@ -1390,7 +1390,7 @@ class task extends control
/* Get users and projects. */
$users = $this->loadModel('user')->getPairs('noletter');
$projects = $this->loadModel('project')->getPairs('all|nocode', $this->session->PRJ);
$projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'all|nocode');
/* Get related objects id lists. */
$relatedStoryIdList = array();
module/task/model.php
+1 -1
View File
@@ -2509,7 +2509,7 @@ class taskModel extends model
$datas = $this->processData4Report($tasks, '', 'project');
$projects = $this->loadModel('project')->getPairs('all', $this->session->PRJ);
$projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'all');
foreach($datas as $projectID => $data)
{
$data->name = isset($projects[$projectID]) ? $projects[$projectID] : $this->lang->report->undefined;
module/todo/control.php
+1 -1
View File
@@ -376,7 +376,7 @@ class todo extends control
$this->view->users = $this->user->getPairs('noletter');
$this->view->actions = $this->loadModel('action')->getList('todo', $todoID);
$this->view->from = $from;
$this->view->projects = $this->loadModel('project')->getPairs('', $this->session->PRJ);
$this->view->projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ);
$this->view->products = $this->loadModel('product')->getPairs('', $this->session->PRJ);
$this->display();
module/webhook/control.php
+2 -2
View File
@@ -70,7 +70,7 @@ class webhook extends control
$this->app->loadLang('action');
$this->view->title = $this->lang->webhook->api . $this->lang->colon . $this->lang->webhook->create;
$this->view->products = $this->loadModel('product')->getPairs();
$this->view->projects = $this->loadModel('project')->getPairs();
$this->view->projects = $this->loadModel('project')->getExecutionPairs();
$this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->api);
$this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->common);
$this->view->position[] = $this->lang->webhook->create;
@@ -101,7 +101,7 @@ class webhook extends control
$this->view->position[] = html::a(inlink('browse'), $this->lang->webhook->common);
$this->view->position[] = $this->lang->webhook->edit;
$this->view->products = $this->loadModel('product')->getPairs();
$this->view->projects = $this->loadModel('project')->getPairs();
$this->view->projects = $this->loadModel('project')->getExecutionPairs();
$this->view->webhook = $webhook;
$this->display();