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

* code for task #80451.

Browse Source
This commit is contained in:
wangyidong
2022-12-21 15:50:17 +08:00
parent 034c750da5
commit bc02660990
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/config.php
+1 -1
View File
@@ -164,7 +164,7 @@ $config->bug->datatable->fieldList['product']['dataSource'] = array('module' =>
$config->bug->datatable->fieldList['module']['control'] = 'select';
$config->bug->datatable->fieldList['module']['title'] = 'module';
$config->bug->datatable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&bug');
$config->bug->datatable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&bug&0&all');
$config->bug->datatable->fieldList['title']['title'] = 'title';
$config->bug->datatable->fieldList['title']['fixed'] = 'left';
module/bug/view/view.html.php
+3 -2
View File
@@ -19,11 +19,12 @@
<?php js::set('branchID', $bug->branch);?>
<?php js::set('errorNoExecution', $lang->bug->noExecution);?>
<?php js::set('errorNoProject', $lang->bug->noProject);?>
<?php $browseLink = $app->session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php if(!isonlybody()):?>
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "btn btn-secondary");?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
<div class="divider"></div>
<?php endif;?>
<div class="page-title">
@@ -91,7 +92,7 @@
?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php echo html::backButton('<i class="icon icon-back icon-goback"></i> ' . $lang->goback, "id='back' title='{$lang->goback}{$lang->backShortcutKey}'", 'btn');?>
<?php common::printBack($browseLink);?>
<?php if(!$bug->deleted):?>
<div class='divider'></div>
<?php echo $this->bug->buildOperateMenu($bug, 'view');?>
module/story/control.php
+1
View File
@@ -1373,6 +1373,7 @@ class story extends control
if(!$story) return print(js::error($this->lang->notFound) . js::locate($this->createLink($linkModuleName, 'index')));
if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$story->product,") === false) return print(js::error($this->lang->product->accessDenied) . js::locate('back'));
if(!empty($story->fromBug)) $this->session->set('bugList', $uri, 'qa');
$version = empty($version) ? $story->version : $version;
$story = $this->story->mergeReviewer($story, true);