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

* Fix bug.

Browse Source
This commit is contained in:
leiyong
2021-01-26 17:27:50 +08:00
parent 3283132e75
commit a4abc56c1a
11 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/css/view.css
+2
View File
@@ -3,3 +3,5 @@
#unlinkStoryList, #unlinkBugList {border-top: 1px solid #cbd0db;}
.page-title .dropdown-menu{top: 20px; left: 170px;}
.page-title .text>a{font-weight: 700}
.body-modal #mainContent {min-height: 200px;}
module/build/view/view.html.php
+2
View File
@@ -46,6 +46,7 @@ tbody tr td:first-child input{display:none;}
<?php endif; ?>
</div>
</div>
<?php if(!isonlybody()):?>
<div class='btn-toolbar pull-right'>
<?php
if(!$build->deleted and $canBeChanged)
@@ -57,6 +58,7 @@ tbody tr td:first-child input{display:none;}
}
?>
</div>
<?php endif;?>
</div>
<div id='mainContent' class='main-content'>
<div class='tabs' id='tabsNav'>
module/doc/view/view.html.php
+4
View File
@@ -30,8 +30,10 @@ js::set('docID', $doc->id);
?>
<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-primary'");?>
<div class="divider"></div>
<?php endif;?>
<div class="page-title">
<span class="label label-id"><?php echo $doc->id;?></span><span class="text" title='<?php echo $doc->title;?>'><?php echo $doc->title;?></span>
<?php if($doc->deleted):?>
@@ -78,9 +80,11 @@ js::set('docID', $doc->id);
<?php endif; ?>
</div>
</div>
<?php if(!isonlybody()):?>
<div class='btn-toolbar pull-right'>
<button type='button' class='btn btn-secondary fullscreen-btn' title='<?php echo $lang->retrack;?>'><i class='icon icon-fullscreen'></i><?php echo ' ' . $lang->retrack;?></button>
</div>
<?php endif;?>
</div>
<div id="mainContent" class="main-row">
<div class="main-col col-8">
module/product/view/view.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div id='mainContent' class="main-row">
<div id='mainContent' class="main-row" <?php if(isonlybody()) echo 'style="padding-top: 0px;"';?>>
<div class="col-12 main-col">
<div class="row">
<div class="col-sm-12">
module/productplan/css/view.css
+1
View File
@@ -23,3 +23,4 @@
ol, ul { padding-left: 20px; }
#tabsNav .tab-pane>.main-table {border-radius: 0;}
.body-modal #mainMenu>.btn-toolbar {width: auto;}
.body-modal #mainContent {min-height: 240px;}
module/project/view/view.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div id='mainContent' class="main-row">
<div id='mainContent' class="main-row" <?php if(isonlybody()) echo 'style="padding-top: 0px;"';?>>
<div class="col-8 main-col">
<div class="row">
<div class="col-sm-6">
module/release/css/view.css
+2
View File
@@ -8,3 +8,5 @@
#tabsNav .nav-tabs > li.pull-right {margin-right: 120px; margin-top: -5px}
#tabsNav .nav-tabs > li.active + li.pull-right {margin-right: 0;}
ol, ul { padding-left: 20px; }
.body-modal #mainMenu>.btn-toolbar {width: auto;}
.body-modal #mainContent {min-height: 240px;}
module/search/model.php
+8 -4
View File
@@ -524,11 +524,12 @@ class searchModel extends model
if(is_numeric($word) and strlen($word) == 5) $condition = "OR title REGEXP '[^ ]{$likeWord}[^ ]' OR content REGEXP '[^ ]{$likeWord}[^ ]'";
$likeCondition .= $condition;
}
$words = str_replace('"', '', $against);
$words = str_pad($words, 5, '_');
$allowedObject = array();
if($type != 'all')
{
foreach($type as $module) $allowedObject[] = $module;
@@ -540,7 +541,9 @@ class searchModel extends model
$module = $objectType;
if($module == 'case') $module = 'testcase';
if(common::hasPriv($module, 'view')) $allowedObject[] = $objectType;
if($module == 'caselib' and common::hasPriv('caselib', 'view')) $allowedObject[] = $objectType;
if($module == 'caselib' and common::hasPriv('caselib', 'view')) $allowedObject[] = $objectType;
if($module == 'execution' and common::haspriv('project', 'view')) $allowedobject[] = $objectType;
if($module == 'project' and common::haspriv('program', 'index')) $allowedobject[] = $objectType;
}
}
@@ -569,7 +572,7 @@ class searchModel extends model
$method = 'viewstep';
}
if(strpos(',task,bug,case,build,release,testtask,testsuite,testreport,issue,risk,', ",$module,") !== false)
if(strpos(',task,bug,testcase,build,release,testtask,testsuite,testreport,issue,risk,', ",$module,") !== false)
{
if(!isset($this->config->objectTables[$record->objectType])) continue;
$table = $this->config->objectTables[$record->objectType];
@@ -731,6 +734,8 @@ class searchModel extends model
*/
public function checkPriv($results, $pager = null)
{
if($this->app->user->admin) return $results;
$this->loadModel('doc');
$products = $this->app->user->view->products;
$programs = $this->app->user->view->programs;
@@ -842,7 +847,6 @@ class searchModel extends model
$noPrivNum++;
}
}
}
elseif($objectType == 'todo')
{
module/story/view/view.html.php
+5
View File
@@ -399,7 +399,9 @@
<div class='tabs'>
<ul class='nav nav-tabs'>
<li class='active'><a href='#legendStories' data-toggle='tab'><?php echo $story->type == 'story' ? $lang->story->requirement : $lang->story->story;?></a></li>
<?php if($story->type == 'story'):?>
<li><a href='#legendProjectAndTask' data-toggle='tab'><?php echo $lang->story->legendProjectAndTask;?></a></li>
<?php endif;?>
<li><a href='#legendRelated' data-toggle='tab'><?php echo $lang->story->legendRelated;?></a></li>
</ul>
<div class='tab-content'>
@@ -419,6 +421,8 @@
<?php if(!empty($relations)) echo html::a('javascript:void(0)', $lang->story->unlink . $linkLang, '', "class='btn btn-info' id='unlinkStory'");?></li>
</ul>
</div>
<?php if($story->type == 'story'):?>
<div class='tab-pane active' id='legendProjectAndTask'>
<ul class="list-unstyled">
<?php
@@ -443,6 +447,7 @@
?>
</ul>
</div>
<?php endif;?>
<div class="tab-pane" id='legendRelated'>
<table class="table table-data">
<tbody>
module/testreport/view/view.html.php
+2
View File
@@ -15,9 +15,11 @@
<?php include '../../common/view/chart.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php if(!isonlybody()):?>
<?php $browseLink = $this->session->reportList != false ? $app->session->reportList : $browseLink;?>
<?php echo html::a($browseLink, "<i class='icon icon-back icon-sm'></i>" . $lang->goback, '', "class='btn btn-primary'");?>
<div class='divider'></div>
<?php endif;?>
<div class='page-title'>
<span class='label label-id'><?php echo $report->id;?></span>
<span class='text' title='<?php echo $report->title;?>'><?php echo $report->title;?></span>
module/testsuite/view/view.html.php
+2
View File
@@ -147,6 +147,7 @@
</form>
</div>
</div>
<?php if(!isonlybody()):?>
<div class='side-col col-4'>
<div class='cell'>
<div class='detail'>
@@ -161,5 +162,6 @@
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>