From f3a1f7cf2ac0def7cf780f85c79eb432e504e697 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Tue, 31 May 2022 16:47:13 +0800 Subject: [PATCH] * Fix bug #23114. --- module/program/control.php | 2 +- module/program/model.php | 14 -------------- module/project/control.php | 2 +- module/project/model.php | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index c8aa0be0f8..c71fe19246 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -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; diff --git a/module/program/model.php b/module/program/model.php index 2bbaa986ee..9c96684c43 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -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. * diff --git a/module/project/control.php b/module/project/control.php index d2d0fab4ab..5bfc6e474e 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -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(); } diff --git a/module/project/model.php b/module/project/model.php index 86027b4422..cc5d5ae4d3 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -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; }