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 'sprint/zentaomax35'

Browse Source 
* fix bug #23729

See merge request easycorp/zentaopms!4272
This commit is contained in:
王怡栋
2022-06-30 07:21:19 +00:00
parent 18a15b1d9d 76b79da0c1
commit 24078a47db
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/feedback/ext/view/view.lite.html.hook.php
+3
View File
@@ -0,0 +1,3 @@
<script>
$("#createCaseActionMenu a[href=#toBug]").remove();
</script>
extension/lite/todo/ext/view/view.lite.html.hook.php
+2 -2
View File
@@ -37,7 +37,7 @@ $('#toStoryLink').click(function()
$('#toStoryButtonByProject').click(function()
{
var onlybody = config.onlybody == 'yes';
var projectID = $('#projectToStory').val();
var projectID = $('#projectToStory').val();
var link = createLink('story', 'create', 'productID=0&branch=0&moduleID=0&storyID=0&projectID=' + projectID + '&bugID=0&planID=0&todoID=' + todoID, config.defaultView, onlybody);
if(!onlybody) window.parent.$.apps.open(link, 'project');
@@ -75,4 +75,4 @@ function createProject()
config.onlybody = onlybody;
parent.location.href = link;
}
</script>
</script>
module/caselib/css/showimport.css
Vendored
+1
View File
@@ -1 +1,2 @@
.table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px !important; border: none !important;}
.c-pri{width: 70px;}
module/caselib/view/showimport.html.php
+16 -8
View File
@@ -20,6 +20,7 @@ $(function()
});
</script>
<?php else:?>
<?php js::set('requiredFields', $requiredFields);?>
<div id="mainContent" class="main-content">
<div class="main-header clearfix">
<h2><?php echo $lang->caselib->import;?></h2>
@@ -29,13 +30,13 @@ $(function()
<thead>
<tr>
<th class='c-number'><?php echo $lang->testcase->id?></th>
<th><?php echo $lang->testcase->title?></th>
<th class='c-module'><?php echo $lang->testcase->module?></th>
<th class='c-status'><?php echo $lang->testcase->pri?></th>
<th class='c-status'><?php echo $lang->testcase->type?></th>
<th><?php echo $lang->testcase->stage?></th>
<th class='c-text'><?php echo $lang->testcase->keywords?></th>
<th><?php echo $lang->testcase->precondition?></th>
<th class='c-title' id='title'> <?php echo $lang->testcase->title?></th>
<th class='c-module' id='module'> <?php echo $lang->testcase->module?></th>
<th class='c-pri' id='pri'> <?php echo $lang->testcase->pri?></th>
<th class='c-type' id='type'> <?php echo $lang->testcase->type?></th>
<th class='c-stage' id='stage'> <?php echo $lang->testcase->stage?></th>
<th class='c-text' id='keywords'> <?php echo $lang->testcase->keywords?></th>
<th class='c-precondition' id='precondition'><?php echo $lang->testcase->precondition?></th>
<th class='c-case-step col-content'>
<table class='w-p100 table-borderless'>
<tr>
@@ -127,6 +128,13 @@ $(function()
<style>#mainContent .col-content{display: none;}</style>
<?php endif;?>
<script>
$(function(){$.fixedTableHead('#showData');});
$(function()
{
$.fixedTableHead('#showData');
$("#showData th").each(function()
{
if(requiredFields.indexOf(this.id) !== -1) $("#" + this.id).addClass('required');
});
});
</script>
<?php include '../../common/view/footer.html.php';?>
module/story/view/view.html.php
+1 -1
View File
@@ -307,7 +307,7 @@
<?php endif;?>
<tr>
<th><?php echo $lang->story->category;?></th>
<td><?php echo $lang->story->categoryList[$story->category];?></td>
<td><?php echo zget($lang->story->categoryList, $story->category, $story->category)?></td>
</tr>
<tr>
<th><?php echo $lang->story->pri;?></th>