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

Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

Browse Source 
* finish task #75921

See merge request easycorp/zentaopms!6176
This commit is contained in:
王怡栋
2022-11-16 02:04:10 +00:00
parent b328b219e5 b18918ad22
commit 5a11d47992
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/view.html.php
-1
View File
@@ -9,7 +9,6 @@
* @version $Id: view.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
module/common/lang/menu.php
+1 -1
View File
@@ -343,7 +343,7 @@ $lang->execution->menu->view = array('link' => "$lang->view|execution|grouptas
if($config->edition != 'open') $lang->execution->menu->view = array('link' => "$lang->view|execution|gantt|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation');
$lang->execution->menu->storyGroup = array('link' => "{$lang->common->story}|execution|story|executionID=%s",'class' => 'dropdown dropdown-hover', 'subModule' => 'story', 'alias' => 'batchcreate,storykanban');
$lang->execution->menu->story = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'storykanban,linkstory');
$lang->execution->menu->story = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story,execution', 'alias' => 'storykanban,linkstory');
$lang->execution->menu->qa = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
$lang->execution->menu->devops = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
$lang->execution->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=execution&objectID=%s", 'subModule' => 'doc');
module/execution/model.php
+5
View File
@@ -142,6 +142,11 @@ class executionModel extends model
$this->loadModel('project')->setNoMultipleMenu($executionID);
if(isset($this->lang->execution->menu->storyGroup)) unset($this->lang->execution->menu->storyGroup);
if(isset($this->lang->execution->menu->story['dropMenu']) and $methodName == 'storykanban')
{
unset($this->lang->execution->menu->story['dropMenu']);
$this->lang->execution->menu->story['link'] = str_replace(array($this->lang->common->story, 'story'), array($this->lang->SRCommon, 'storykanban'), $this->lang->execution->menu->story['link']);
}
}
/**
module/story/control.php
+3 -3
View File
@@ -2819,9 +2819,9 @@ class story extends control
/* Unset product field when in single project. */
if(isset($project->hasProduct) && !$project->hasProduct)
{
$filterFields = array('product,', 'branch,');
if($project->model != 'scrum') $filterFields[] = 'plan,';
$this->config->story->exportFields = str_replace($filterFields, '', $this->config->story->exportFields);
$filterFields = array(', product,', ', branch,');
if($project->model != 'scrum') $filterFields[] = ', plan,';
$this->config->story->exportFields = str_replace($filterFields, ',', $this->config->story->exportFields);
}
$this->view->fileName = $fileName;