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

Merge branch 'mayue_fix_bug#17402' into 'master'

Browse Source 
* Fix bug#17402.

See merge request easycorp/zentaopms!2543
This commit is contained in:
孙广明
2022-03-25 06:23:58 +00:00
parent 45ba41e14e 59af75b136
commit 06c255995c
5 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
-2
View File
@@ -152,8 +152,6 @@ class executionModel extends model
$output = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentExecutionName}'><span class='text'><i class='icon icon-sprint'></i> {$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
$output .= "</div></div>";
$this->lang->execution->switcherMenu = $output;
}
$output = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentExecutionName}'><span class='text'><i class='icon icon-{$this->lang->icons[$currentExecution->type]}'></i> {$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
module/product/config.php
+1 -1
View File
@@ -13,7 +13,7 @@ if($config->systemMode == 'new') $config->product->custom->batchEditFields .= ',
$config->product->list = new stdclass();
$config->product->list->exportFields = 'id,program,line,name,activeRequirements,changedRequirements,draftRequirements,closedRequirements,requireCompleteRate,activeStories,changedStories,draftStories,closedStories,storyCompleteRate,plans,releases,bugs,unResolvedBugs,assignToNullBugs,closedBugs,bugFixedRate';
$config->product->showBranchMethod = 'browse,project,roadmap';
$config->product->showBranchMethod = 'browse,project';
global $lang, $app;
$app->loadLang('story');
module/product/control.php
+1 -14
View File
@@ -50,8 +50,6 @@ class product extends control
*/
public function index($locate = 'auto', $productID = 0, $status = 'noclosed', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
$this->lang->product->switcherMenu = $this->product->getSwitcher();
if($locate == 'yes') $this->locate($this->createLink($this->moduleName, 'browse'));
if($this->app->getViewType() != 'mhtml') unset($this->lang->product->menu->index);
@@ -591,7 +589,6 @@ class product extends control
*/
public function batchEdit($programID = 0)
{
$this->lang->product->switcherMenu = '';
if($this->post->names)
{
$allChanges = $this->product->batchUpdate();
@@ -630,9 +627,6 @@ class product extends control
$appendRdUsers[$product->RD] = $product->RD;
}
/* Navigation remains under the program. */
$this->lang->program->switcherMenu = $this->loadModel('program')->getSwitcher($programID, true);
$this->loadModel('user');
$poUsers = $this->user->getPairs('nodeleted|noclosed|pofirst', $appendPoUsers);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;
@@ -798,12 +792,8 @@ class product extends control
* @access public
* @return void
*/
public function roadmap($productID, $branch = '')
public function roadmap($productID, $branch = 'all')
{
$branch = ($this->cookie->preBranch !== '' and $branch === '') ? $this->cookie->preBranch : $branch;
setcookie('preBranch', $branch, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
$this->product->setMenu($productID, $branch);
$this->session->set('releaseList', $this->app->getURI(true), 'product');
@@ -875,8 +865,6 @@ class product extends control
$this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $this->products[$productID]);
$this->view->position[] = $this->lang->product->dynamic;
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID, $type);
$this->view->userIdPairs = $this->loadModel('user')->getPairs('noletter|nodeleted|noclosed|useid');
$this->view->accountPairs = $this->user->getPairs('noletter|nodeleted|noclosed');
@@ -1322,7 +1310,6 @@ class product extends control
*/
public function whitelist($productID = 0, $module = 'product', $objectType = 'product', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', 0);
$this->product->setMenu($productID, 0);
$this->lang->modulePageNav = '';
module/projectrelease/control.php
-2
View File
@@ -41,8 +41,6 @@ class projectrelease extends control
*/
public function commonAction($projectID = 0, $productID = 0, $branch = 0)
{
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
/* Get product and product list by project. */
$this->products = $this->product->getProductPairsByProject($projectID);
if(empty($this->products)) return print($this->locate($this->createLink('product', 'showErrorNone', 'moduleName=project&activeMenu=projectrelease&projectID=' . $projectID)));
module/story/control.php
+3 -10
View File
@@ -51,14 +51,14 @@ class story extends control
parse_str($extra, $output);
if($productID == 0 and $objectID == 0) $this->locate($this->createLink('product', 'create'));
/* Get product id according to the project id when lite vision todo transfer story */
if($this->config->vision == 'lite' and $productID == 0)
if($this->config->vision == 'lite' and $productID == 0)
{
$product = $this->loadModel('product')->getProductPairsByProject($objectID);
if(!empty($project)) $productID = key($product);
}
$this->story->replaceURLang($type);
if($this->app->tab == 'product')
{
@@ -402,8 +402,6 @@ class story extends control
*/
public function batchCreate($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $executionID = 0, $plan = 0, $type = 'story', $extra = '')
{
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
/* Set menu. */
if($executionID)
{
@@ -650,7 +648,6 @@ class story extends control
$moduleOptionMenu = $this->tree->getOptionMenu($product->id, $viewType = 'story', 0, $story->branch);
/* Set menu. */
$this->lang->product->switcherMenu = $this->product->getSwitcher($product->id);
if($this->app->tab == 'project')
{
$this->loadModel('project')->setMenu($this->session->project);
@@ -794,7 +791,6 @@ class story extends control
*/
public function batchEdit($productID = 0, $executionID = 0, $branch = 0, $storyType = 'story', $from = '')
{
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
$this->story->replaceURLang($storyType);
if($this->app->tab == 'product')
@@ -1243,8 +1239,6 @@ class story extends control
*/
public function review($storyID, $from = 'product')
{
$this->lang->product->switcherMenu = $this->product->getSwitcher($this->session->product);
if(!empty($_POST))
{
$changes = $this->story->review($storyID);
@@ -2230,7 +2224,6 @@ class story extends control
$this->story->replaceURLang($storyType);
$this->products = $this->product->getPairs();
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID, $storyType, $branchID);
$this->product->setMenu($productID, $branchID);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->story->reportChart;