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

* code task #80458,80463.

Browse Source
This commit is contained in:
wangyidong
2022-12-20 11:31:15 +08:00
parent ffe0b359e9
commit 58efe7b011
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/view.html.php
+2 -3
View File
@@ -19,12 +19,11 @@
<?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::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "btn btn-secondary");?>
<div class="divider"></div>
<?php endif;?>
<div class="page-title">
@@ -92,7 +91,7 @@
?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php echo html::backButton('<i class="icon icon-back icon-goback"></i> ' . $lang->goback, "id='back' title='{$lang->goback}{$lang->backShortcutKey}'", 'btn');?>
<?php if(!$bug->deleted):?>
<div class='divider'></div>
<?php echo $this->bug->buildOperateMenu($bug, 'view');?>
module/product/model.php
+1 -1
View File
@@ -1314,7 +1314,7 @@ class productModel extends model
->fetchAll('id');
/* Determine how to display the name of the program. */
$programList = $this->loadModel('program')->getParentPairs('', '');
$programList = $this->loadModel('program')->getParentPairs('', 'all');
foreach($projectList as $id => $project)
{
$projectList[$id]->programName = $project->parent ? zget($programList, $project->parent, '') : '';
module/program/model.php
+2 -2
View File
@@ -1250,7 +1250,7 @@ class programModel extends model
* Get program parent pairs
*
* @param string $model
* @param string $mode
* @param string $mode noclosed|all
* @param bool $showRoot
* @access public
* @return array
@@ -1268,7 +1268,7 @@ class programModel extends model
$treeMenu = array();
foreach($modules as $module)
{
if(strpos(",{$this->app->user->view->programs},", ",{$module->id},") === false and (!$this->app->user->admin)) continue;
if(strpos($mode, 'all') !== false and strpos(",{$this->app->user->view->programs},", ",{$module->id},") === false and (!$this->app->user->admin)) continue;
$moduleName = $showRoot ? '/' : '';
$parentModules = explode(',', $module->path);