From 7aaf8a9014e1fa48951c94eaa97e760f77c94b52 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Mon, 7 Dec 2020 15:05:19 +0800
Subject: [PATCH] * Adjust code.

---
 module/common/lang/de.php         |  4 ++--
 module/common/lang/en.php         |  4 ++--
 module/common/lang/fr.php         |  4 ++--
 module/common/lang/vi.php         |  4 ++--
 module/common/lang/zh-cn.php      |  4 ++--
 module/common/lang/zh-tw.php      |  4 ++--
 module/common/model.php           | 17 +++++++++++------
 module/weekly/control.php         |  2 +-
 module/weekly/model.php           |  2 +-
 module/workestimation/control.php | 27 ++++++++++++++-------------
 module/workestimation/model.php   |  2 +-
 11 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 9707b24a92..d38a5472fe 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink       = array('link' => 'More|project|morelink', 'c
 $lang->scrum = new stdclass();
 $lang->scrum->subMenu = new stdclass();
 $lang->scrum->subMenu->morelink = new stdclass();
-$lang->scrum->subMenu->morelink->program = 'Program|program|edit|';
+$lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
 
 /* Waterfall menu. */
 $lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
 $lang->waterfall->subMenu->morelink = new stdclass();
 $lang->waterfall->subMenu->morelink->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
 $lang->waterfall->subMenu->morelink->stakeholder    = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->morelink->program        = 'Project|program|edit|';
+$lang->waterfall->subMenu->morelink->program        = 'Project|program|PRJEdit|';
 
 $lang->waterfallproduct   = new stdclass();
 $lang->workestimation     = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 662a7ede11..b93883f593 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink       = array('link' => 'More|project|morelink', 'c
 $lang->scrum = new stdclass();
 $lang->scrum->subMenu = new stdclass();
 $lang->scrum->subMenu->morelink = new stdclass();
-$lang->scrum->subMenu->morelink->program = 'Program|program|edit|';
+$lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
 
 /* Waterfall menu. */
 $lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
 $lang->waterfall->subMenu->morelink = new stdclass();
 $lang->waterfall->subMenu->morelink->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
 $lang->waterfall->subMenu->morelink->stakeholder    = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->morelink->program        = 'Project|program|edit|';
+$lang->waterfall->subMenu->morelink->program        = 'Project|program|PRJEdit|';
 
 $lang->waterfallproduct   = new stdclass();
 $lang->workestimation     = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 4f6002dcad..53c7f6cc4f 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink       = array('link' => 'More|project|morelink', 'c
 $lang->scrum = new stdclass();
 $lang->scrum->subMenu = new stdclass();
 $lang->scrum->subMenu->morelink = new stdclass();
-$lang->scrum->subMenu->morelink->program = 'Program|program|edit|';
+$lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
 
 /* Waterfall menu. */
 $lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
 $lang->waterfall->subMenu->morelink = new stdclass();
 $lang->waterfall->subMenu->morelink->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
 $lang->waterfall->subMenu->morelink->stakeholder    = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->morelink->program        = 'Project|program|edit|';
+$lang->waterfall->subMenu->morelink->program        = 'Project|program|PRJEdit|';
 
 $lang->waterfallproduct   = new stdclass();
 $lang->workestimation     = new stdclass();
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index a2b71238d6..b2ce5b074d 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink       = array('link' => 'More|project|morelink', 'c
 $lang->scrum = new stdclass();
 $lang->scrum->subMenu = new stdclass();
 $lang->scrum->subMenu->morelink = new stdclass();
-$lang->scrum->subMenu->morelink->program = 'Program|program|edit|';
+$lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
 
 /* Waterfall menu. */
 $lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
 $lang->waterfall->subMenu->morelink = new stdclass();
 $lang->waterfall->subMenu->morelink->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
 $lang->waterfall->subMenu->morelink->stakeholder    = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->morelink->program        = 'Project|program|edit|';
+$lang->waterfall->subMenu->morelink->program        = 'Project|program|PRJEdit|';
 
 $lang->waterfallproduct   = new stdclass();
 $lang->workestimation     = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 8e5dc3ae9d..d49a8f54e4 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink       = array('link' => '更多|project|morelink',
 $lang->scrum = new stdclass();
 $lang->scrum->subMenu = new stdclass();
 $lang->scrum->subMenu->morelink = new stdclass();
-$lang->scrum->subMenu->morelink->program = '项目|program|edit|';
+$lang->scrum->subMenu->morelink->program = '项目|program|PRJEdit|';
 
 /* Waterfall menu. */
 $lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
 $lang->waterfall->subMenu->morelink = new stdclass();
 $lang->waterfall->subMenu->morelink->workestimation = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
 $lang->waterfall->subMenu->morelink->stakeholder    = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->morelink->program        = '项目|program|edit|';
+$lang->waterfall->subMenu->morelink->program        = '项目|program|PRJEdit|';
 
 $lang->waterfallproduct   = new stdclass();
 $lang->workestimation     = new stdclass();
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 35c3a8b271..cc909eea77 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -875,7 +875,7 @@ $lang->menu->scrum->morelink       = array('link' => '更多|project|morelink',
 $lang->scrum = new stdclass();
 $lang->scrum->subMenu = new stdclass();
 $lang->scrum->subMenu->morelink = new stdclass();
-$lang->scrum->subMenu->morelink->program = '項目|program|edit|';
+$lang->scrum->subMenu->morelink->program = '項目|program|PRJEdit|';
 
 /* Waterfall menu. */
 $lang->menu->waterfall = new stdclass();
@@ -898,7 +898,7 @@ $lang->waterfall->subMenu = new stdclass();
 $lang->waterfall->subMenu->morelink = new stdclass();
 $lang->waterfall->subMenu->morelink->workestimation = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
 $lang->waterfall->subMenu->morelink->stakeholder    = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->morelink->program        = '項目|program|edit|';
+$lang->waterfall->subMenu->morelink->program        = '項目|program|PRJEdit|';
 
 $lang->waterfallproduct   = new stdclass();
 $lang->workestimation     = new stdclass();
diff --git a/module/common/model.php b/module/common/model.php
index edc3b63b2d..9b3ee5d3df 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -898,17 +898,19 @@ class commonModel extends model
         echo '<li>' . html::a(helper::createLink('my', 'index'), $lang->zentaoPMS) . '</li>';
         if($moduleName != 'index')
         {
-            if(!isset($lang->menu->$mainMenu)) return print("</ul>");
-
-            $menuLink = $lang->menu->$mainMenu;
-            if(is_array($menuLink)) $menuLink = $menuLink['link'];
-            list($menuLabel, $module, $method) = explode('|', $menuLink);
-            echo '<li>' . html::a(helper::createLink($module, $method), $menuLabel) . '</li>';
+            if(isset($lang->menu->$mainMenu))
+            {
+                $menuLink = $lang->menu->$mainMenu;
+                if(is_array($menuLink)) $menuLink = $menuLink['link'];
+                list($menuLabel, $module, $method) = explode('|', $menuLink);
+                echo '<li>' . html::a(helper::createLink($module, $method), $menuLabel) . '</li>';
+            }
         }
         else
         {
             echo '<li>' . $lang->index->common . '</li>';
         }
+
         if(empty($position))
         {
             echo '</ul>';
@@ -1718,6 +1720,9 @@ EOD;
         $module = strtolower($module);
         $method = strtolower($method);
 
+        /* More menus do not require permission control. */
+        if($module == 'project' && $method == 'morelink') return true;
+
         /* Check the parent object is closed. */
         if(!empty($method) and strpos('close|batchclose', $method) === false and !commonModel::canBeChanged($module, $object)) return false;
 
diff --git a/module/weekly/control.php b/module/weekly/control.php
index 3a180b3acc..a49dee74b5 100644
--- a/module/weekly/control.php
+++ b/module/weekly/control.php
@@ -7,7 +7,7 @@
  * @author      Xiying Guan <guanxiying@xirangit.com>
  * @package     weekly
  * @version     $Id$
- * @link        http://www.chanzhi.org
+ * @link        http://www.zentao.net
  */
 class weekly extends control
 {
diff --git a/module/weekly/model.php b/module/weekly/model.php
index b016b54e10..7f494c340c 100644
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -7,7 +7,7 @@
  * @author      Xiying Guan <guanxiying@xirangit.com>
  * @package     weekly
  * @version     $Id$
- * @link        http://www.chanzhi.org
+ * @link        http://www.zentao.net
  */
 class weeklyModel extends model
 {
diff --git a/module/workestimation/control.php b/module/workestimation/control.php
index e619da2376..aa165226b2 100644
--- a/module/workestimation/control.php
+++ b/module/workestimation/control.php
@@ -7,44 +7,45 @@
  * @author      Xiying Guan <guanxiying@xirangit.com>
  * @package     workestimation
  * @version     $Id$
- * @link        http://www.chanzhi.org
+ * @link        http://www.zentao.net
  */
 class workestimation extends control
 {
     /**
-     * Index.
+     * Project workload estimations.
      *
-     * @param  int    $program
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function index($program = 0)
+    public function index($projectID = 0)
     {
-        $program = $program ? $program : $this->session->PRJ;
+        $projectID = $projectID ? $projectID : $this->session->PRJ;
         if($_POST)
         {
-            $result = $this->workestimation->save($program);
+            $result = $this->workestimation->save($projectID);
             if($result) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->server->http_referer));
             $this->send(array('result' => 'fail', 'message' => dao::getError()));
         }
 
-        $this->view->title        = $this->lang->workestimation->common;
-        $this->view->programScale = $this->workestimation->getProgramScale($program);
-        $this->view->hourPoint    = $this->config->custom->hourPoint;
-
-        $budget = $this->workestimation->getBudget($program);
+        $scale  = $this->workestimation->getProgramScale($projectID);
+        $budget = $this->workestimation->getBudget($projectID);
         if(!isset($this->config->project)) $this->config->project = new stdclass();
         if(empty($budget))
         {
             $this->app->loadConfig('estimate');
             $budget = new stdclass();
-            $budget->scale         = $this->view->programScale;
+            $budget->scale         = $scale;
             $budget->productivity  = zget($this->config->custom, 'efficiency', '');
             $budget->unitLaborCost = zget($this->config->custom, 'cost', '');
             $budget->dayHour       = zget($this->config->project, 'defaultWorkhours', '');
         }
 
-        $this->view->budget      = $budget;
+        $this->view->title        = $this->lang->workestimation->common;
+        $this->view->position[]   = $this->lang->workestimation->common;
+        $this->view->hourPoint    = $this->config->custom->hourPoint;
+        $this->view->programScale = $scale;
+        $this->view->budget       = $budget;
         $this->display();
     }
 }
diff --git a/module/workestimation/model.php b/module/workestimation/model.php
index 0da0ee4bdd..3c0b570583 100644
--- a/module/workestimation/model.php
+++ b/module/workestimation/model.php
@@ -7,7 +7,7 @@
  * @author      Xiying Guan <guanxiying@xirangit.com>
  * @package     workestimation
  * @version     $Id$
- * @link        http://www.chanzhi.org
+ * @link        http://www.zentao.net
  */
 class workestimationModel extends model
 {