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

* Fix bug #23114.

Browse Source
This commit is contained in:
tanghucheng
2022-05-31 16:47:13 +08:00
parent 0876b18db8
commit f3a1f7cf2a
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/control.php
+1 -1
View File
@@ -252,7 +252,7 @@ class program extends control
$this->view->program = $program;
$this->view->parents = $parents;
$this->view->programList = $this->program->getList();
$this->view->budgetUnitList = $this->program->getBudgetUnitList();
$this->view->budgetUnitList = $this->loadModel('project')->getBudgetUnitList();
$this->view->parentProgram = $parentProgram;
$this->view->availableBudget = $this->program->getBudgetLeft($parentProgram) + (float)$program->budget;
module/program/model.php
-14
View File
@@ -1443,20 +1443,6 @@ class programModel extends model
return $stats;
}
/**
* Get budget unit list.
*
* @access public
* @return array
*/
public function getBudgetUnitList()
{
$budgetUnitList = array();
foreach(explode(',', $this->config->project->unitList) as $unit) $budgetUnitList[$unit] = zget($this->lang->project->unitList, $unit, '');
return $budgetUnitList;
}
/**
* Get program team member pairs.
*
module/project/control.php
+1 -1
View File
@@ -523,7 +523,7 @@ class project extends control
$this->view->parentProgram = $parentProgram;
$this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs();
$this->view->availableBudget = $this->program->getBudgetLeft($parentProgram);
$this->view->budgetUnitList = $this->program->getBudgetUnitList();
$this->view->budgetUnitList = $this->project->getBudgetUnitList();
$this->display();
}
module/project/model.php
+1 -1
View File
@@ -102,7 +102,7 @@ class projectModel extends model
public function getBudgetUnitList()
{
$budgetUnitList = array();
foreach(explode(',', $this->config->project->unitList) as $unit) $budgetUnitList[$unit] = zget($this->lang->project->unitList, $unit, '');
if($this->config->vision != 'lite') foreach(explode(',', $this->config->project->unitList) as $unit) $budgetUnitList[$unit] = zget($this->lang->project->unitList, $unit, '');
return $budgetUnitList;
}