diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 3d0fef30d4..5c9d1be56b 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -865,7 +865,7 @@ $lang->menu->scrum->doc = '文档|doc|index|'; $lang->menu->scrum->qa = '测试|qa|index'; $lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse'); $lang->menu->scrum->stakeholder = '干系人|stakeholder|browse'; -$lang->menu->scrum->list = array('link' => '更多|program|prjedit|project={PROJECT}', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder'); +$lang->menu->scrum->list = array('link' => '更多|program|prjedit|project={PROJECT}', 'class' => 'dropdown dropdown-hover waterfall-list'); $lang->scrum = new stdclass(); $lang->scrum->subMenu = new stdclass(); diff --git a/module/common/model.php b/module/common/model.php index 4c534b8a6a..bb1a3b9c1e 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -693,6 +693,9 @@ class commonModel extends model $subMenu = ""; } + /* Disable links to more buttons. */ + if($menuItem->name == 'list') $link='javascript:void(0);'; + $menuItemHtml = "
  • " . html::a($link, $label, $target) . $subMenu . "
  • \n"; echo $menuItemHtml; diff --git a/module/program/view/prjmanagemembers.html.php b/module/program/view/prjmanagemembers.html.php index a67c929d64..5e62e1c546 100644 --- a/module/program/view/prjmanagemembers.html.php +++ b/module/program/view/prjmanagemembers.html.php @@ -83,7 +83,13 @@ - createLink('program', 'PRJBrowse', '', '', '', $project->id), $lang->goback, '', 'class="btn btn-back btn-wide"');?> + + + + + + + diff --git a/module/programplan/model.php b/module/programplan/model.php index cb64477e33..e3c614b3cd 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -311,20 +311,21 @@ class programplanModel extends model /** * Get total percent. * - * @param object $plan + * @param object $stage + * @param object $parent * @access public * @return int */ - public function getTotalPercent($plan, $parent = false) + public function getTotalPercent($stage, $parent = false) { /* When parent is equal to true, query the total workload of the subphase. */ - $projectID = $parent ? $plan->id : $plan->project; - $plans = $this->getStage($projectID, $plan->product, 'parent'); + $projectID = $parent ? $stage->id : $stage->project; + $plans = $this->getStage($projectID, $stage->product, 'parent'); $totalPercent = 0; foreach($plans as $id => $stage) { - if($id == $plan->id) continue; + if($id == $stage->id) continue; $totalPercent += $stage->percent; } @@ -661,12 +662,12 @@ class programplanModel extends model if($plan->parent > 0) { - $parentPlan = $this->getByID($plan->parent); - $plan->attribute = $parentPlan->attribute; - $plan->acl = $parentPlan->acl; - $parentPercent = $parentPlan->percent; + $parentStage = $this->getByID($plan->parent); + $plan->attribute = $parentStage->attribute; + $plan->acl = $parentStage->acl; + $parentPercent = $parentStage->percent; - $childrenTotalPercent = $this->getTotalPercent($parentPlan, true); + $childrenTotalPercent = $this->getTotalPercent($parentStage, true); $childrenTotalPercent = $plan->parent == $oldPlan->parent ? ($childrenTotalPercent - $oldPlan->percent + $plan->percent) : ($childrenTotalPercent + $plan->percent); /* The sum of the workload of the child phases cannot be greater than that of the parent phase. */ @@ -677,12 +678,13 @@ class programplanModel extends model } /* If child plan has milestone, update parent plan set milestone eq 0 . */ - if($plan->milestone and $parentPlan->milestone) $this->dao->update(TABLE_PROJECT)->set('milestone')->eq(0)->where('id')->eq($oldPlan->parent)->exec(); + if($plan->milestone and $parentStage->milestone) $this->dao->update(TABLE_PROJECT)->set('milestone')->eq(0)->where('id')->eq($oldPlan->parent)->exec(); } else { $childrenIDList = $this->dao->select('*')->from(TABLE_PROJECT)->where('parent')->eq($oldPlan->id)->fetch('id'); if(!empty($childrenIDList)) $this->dao->update(TABLE_PROJECT)->set('acl')->eq($plan->acl)->where('id')->in($childrenIDList)->exec(); + /* The workload of the parent plan cannot exceed 100%. */ $oldPlan->parent = $plan->parent; $totalPercent = $this->getTotalPercent($oldPlan);