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

* Finish task #36312.

Browse Source
This commit is contained in:
Yagami
2021-03-02 13:17:26 +08:00
parent a4404e6ce8
commit 1742f06368
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+12 -14
View File
@@ -319,7 +319,6 @@ $lang->resource->product->edit = 'edit';
$lang->resource->product->batchEdit = 'batchEdit';
$lang->resource->product->delete = 'delete';
$lang->resource->product->roadmap = 'roadmap';
$lang->resource->product->doc = 'doc';
$lang->resource->product->dynamic = 'dynamic';
$lang->resource->product->project = 'project';
$lang->resource->product->dashboard = 'dashboard';
@@ -341,19 +340,18 @@ $lang->product->methodOrder[20] = 'edit';
$lang->product->methodOrder[25] = 'batchEdit';
$lang->product->methodOrder[35] = 'delete';
$lang->product->methodOrder[40] = 'roadmap';
//$lang->product->methodOrder[45] = 'doc';
$lang->product->methodOrder[50] = 'dynamic';
$lang->product->methodOrder[55] = 'project';
$lang->product->methodOrder[60] = 'dashboard';
$lang->product->methodOrder[65] = 'close';
$lang->product->methodOrder[70] = 'updateOrder';
$lang->product->methodOrder[75] = 'all';
$lang->product->methodOrder[80] = 'manageLine';
$lang->product->methodOrder[85] = 'build';
$lang->product->methodOrder[90] = 'export';
$lang->product->methodOrder[95] = 'whitelist';
$lang->product->methodOrder[100] = 'addWhitelist';
$lang->product->methodOrder[105] = 'unbindWhielist';
$lang->product->methodOrder[45] = 'dynamic';
$lang->product->methodOrder[50] = 'project';
$lang->product->methodOrder[55] = 'dashboard';
$lang->product->methodOrder[60] = 'close';
$lang->product->methodOrder[65] = 'updateOrder';
$lang->product->methodOrder[70] = 'all';
$lang->product->methodOrder[75] = 'manageLine';
$lang->product->methodOrder[80] = 'build';
$lang->product->methodOrder[85] = 'export';
$lang->product->methodOrder[90] = 'whitelist';
$lang->product->methodOrder[95] = 'addWhitelist';
$lang->product->methodOrder[100] = 'unbindWhielist';
/* Branch. */
$lang->resource->branch = new stdclass();
module/product/model.php
+1 -1
View File
@@ -887,7 +887,7 @@ class productModel extends model
->fetchAll('id');
/* Determine how to display the name of the program. */
$programList = $this->loadModel('program')->getParentPairs();
$programList = $this->loadModel('program')->getParentPairs('', 'noclosed');
foreach($projectList as $id => $project) $projectList[$id]->programName = $programList[$project->parent];
return $projectList;
module/program/model.php
+2 -2
View File
@@ -751,11 +751,11 @@ class programModel extends model
* @access public
* @return array
*/
public function getParentPairs($model = '')
public function getParentPairs($model = '', $mode = '')
{
$modules = $this->dao->select('id,name,parent,path,grade')->from(TABLE_PROGRAM)
->where('type')->eq('program')
->andWhere('status')->ne('closed')
->beginIF(strpos($mode, 'noclosed') === false)->andWhere('status')->ne('closed')->fi()
->andWhere('deleted')->eq(0)
->beginIF($model)->andWhere('model')->eq($model)->fi()
->orderBy('grade desc, `order`')