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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source 
# Conflicts:
#	module/build/view/linkbug.html.php
#	module/build/view/linkstory.html.php
#	module/release/view/linkbug.html.php
#	module/release/view/linkstory.html.php
This commit is contained in:
Catouse
2018-09-06 17:43:57 +08:00
parent b538734033 e261f646e4
commit a6fe7e73cf
18 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/linkbugs.html.php
+2 -1
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2>
@@ -22,7 +23,7 @@
<div id='queryBox' class='show divider'></div>
<?php if($bugs2Link):?>
<form class='main-table' method='post' data-ride='table' target='hiddenwin' id='linkBugsForm'>
<table class='table' id='bugList'>
<table class='table tablesorter' id='bugList'>
<thead>
<tr>
<th class="c-id">
module/build/view/linkbug.html.php
+6 -3
View File
@@ -10,13 +10,13 @@
* @link http://www.zentao.net
*/
?>
<div id='queryBox' class='show no-margin'></div>
<div id='queryBox' class='show'></div>
<div id='unlinkBugList'>
<form class='main-table table-bug' data-ride='table' method='post' id='unlinkedBugsForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkBug', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedBugs;?>
</div>
<table class='table'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -71,4 +71,7 @@
</div>
<?php endif;?>
</form>
</div>
</div>
<script>
$(function(){$('#unlinkBugList .tablesorter').sortTable();});
</script>
module/build/view/linkstory.html.php
+5 -2
View File
@@ -10,13 +10,13 @@
* @link http://www.zentao.net
*/
?>
<div id='queryBox' class='show no-margin'></div>
<div id='queryBox' class='show'></div>
<div id='unlinkStoryList'>
<form class='main-table table-story' data-ride='table' method='post' id='unlinkedStoriesForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkStory', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
</div>
<table class='table'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -76,3 +76,6 @@
<?php endif;?>
</form>
</div>
<script>
$(function(){$('#unlinkStoryList .tablesorter').sortTable();});
</script>
module/build/view/view.html.php
+1
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmUnlinkStory', $lang->build->confirmUnlinkStory)?>
<?php js::set('confirmUnlinkBug', $lang->build->confirmUnlinkBug)?>
<?php js::set('flow', $config->global->flow)?>
module/productplan/view/linkbug.html.php
+4 -1
View File
@@ -16,7 +16,7 @@
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedBugs;?>
</div>
<table class='table'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -71,3 +71,6 @@
</div>
</form>
</div>
<script>
$(function(){$('#unlinkBugList .tablesorter').sortTable();});
</script>
module/productplan/view/linkstory.html.php
+4 -1
View File
@@ -16,7 +16,7 @@
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
</div>
<table class='table'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -79,3 +79,6 @@
</div>
</form>
</div>
<script>
$(function(){$('#unlinkStoryList .tablesorter').sortTable();});
</script>
module/productplan/view/view.html.php
+1
View File
@@ -12,6 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/sortable.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmUnlinkStory', $lang->productplan->confirmUnlinkStory)?>
<?php js::set('confirmUnlinkBug', $lang->productplan->confirmUnlinkBug)?>
<?php js::set('planID', $plan->id);?>
module/project/js/story.js
+1
View File
@@ -28,6 +28,7 @@ $(function()
parent.location.href = createLink('project', 'importPlanStories', 'projectID=' + projectID + '&planID=' + planID);
}
})
$('.sorter-false a').unwrap();
});
function showCheckedSummary()
module/project/view/linkstory.html.php
+2 -1
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<style>
.search-form .form-actions {padding-bottom: 10px!important;}
</style>
@@ -27,7 +28,7 @@
<div id='queryBox' class='show no-margin'></div>
</div>
<form class='main-table table-story' method='post' data-ride='table' id='linkStoryForm'>
<table class='table table-fixed' id='linkStoryList'>
<table class='table table-fixed tablesorter' id='linkStoryList'>
<thead>
<tr>
<th class='c-id'>
module/project/view/story.html.php
+12 -11
View File
@@ -12,6 +12,7 @@
?>
<?php $canOrder = common::hasPriv('project', 'storySort');?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php if($canOrder) include '../../common/view/sortable.html.php';?>
<?php js::set('moduleID', ($type == 'byModule' ? $param : 0));?>
<?php js::set('productID', ($type == 'byProduct' ? $param : 0));?>
@@ -97,7 +98,7 @@
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
</div>
<table class='table has-sort-head' id='storyList'>
<table class='table tablesorter has-sort-head' id='storyList'>
<thead>
<tr>
<?php
@@ -106,7 +107,7 @@
$canBatchClose = common::hasPriv('story', 'batchClose');
?>
<?php $vars = "projectID={$project->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<th class='c-id'>
<th class='c-id {sorter:false}'>
<?php if($canBatchEdit or $canBatchClose):?>
<div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
<label></label>
@@ -115,19 +116,19 @@
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<?php if($canOrder):?>
<th class='w-80px c-sort'> <?php common::printOrderLink('order', $orderBy, $vars, $lang->project->updateOrder);?></th>
<th class='w-80px c-sort {sorter:false}'> <?php common::printOrderLink('order', $orderBy, $vars, $lang->project->updateOrder);?></th>
<?php endif;?>
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-name'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='c-estimate w-80px'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-stage w-70px'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='c-pri {sorter:false}'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-name {sorter:false}'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
<th class='c-user {sorter:false}'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-user {sorter:false}'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='c-estimate w-80px {sorter:false}'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='c-status {sorter:false}'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-stage w-70px {sorter:false}'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th title='<?php echo $lang->story->taskCount?>' class='w-30px'><?php echo $lang->story->taskCountAB;?></th>
<th title='<?php echo $lang->story->bugCount?>' class='w-30px'><?php echo $lang->story->bugCountAB;?></th>
<th title='<?php echo $lang->story->caseCount?>' class='w-30px'><?php echo $lang->story->caseCountAB;?></th>
<th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
<th class='c-actions-4 text-center {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody id='storyTableList' class='sortable'>
module/release/view/linkbug.html.php
+5 -2
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
?>
<div id='queryBox' class='show no-margin'></div>
<div id='queryBox' class='show'></div>
<?php
$releaseBugs = $type == 'bug' ? $release->bugs : $release->leftBugs;
$formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
@@ -20,7 +20,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedBugs;?>
</div>
<table class='table'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -75,3 +75,6 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
</div>
</form>
</div>
<script>
$(function(){$('#<?php echo $formID;?> .tablesorter').sortTable();});
</script>
module/release/view/linkstory.html.php
+7 -4
View File
@@ -10,13 +10,13 @@
* @link http://www.zentao.net
*/
?>
<div id='queryBox' class='show no-margin'></div>
<div id='queryBox' class='show'></div>
<div id='unlinkStoryList'>
<form class='main-table' method='post' target='hiddenwin' id='unlinkedStoriesForm' action='<?php echo $this->createLink('release', 'linkStory', "releaseID=$release->id&browseType=$browseType&param=$param")?>' data-ride='table'>
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
</div>
<table class='table'>
<table class='table tablesorter'>
<thead>
<tr class='text-center'>
<th class='c-id text-left'>
@@ -44,7 +44,7 @@
<tr>
<td class='c-id text-left'>
<div class="checkbox-primary">
<input type='checkbox' name='stories[]' value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />
<input type='checkbox' name='stories[]' value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />
<label></label>
</div>
<?php printf('%03d', $story->id);?>
@@ -74,4 +74,7 @@
<div class='table-statistic'></div>
</div>
</form>
</div>
</div>
<script>
$(function(){$('#unlinkStoryList .tablesorter').sortTable();});
</script>
module/release/view/view.html.php
+1
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmUnlinkStory', $lang->release->confirmUnlinkStory)?>
<?php js::set('confirmUnlinkBug', $lang->release->confirmUnlinkBug)?>
<div id='mainMenu' class='clearfix'>
module/story/view/change.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
<th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
<td>
<div class="input-group w-p35-f">
<?php echo html::select('assignedTo', $users, $story->assignedTo, 'class="form-control chosen"');?>
<?php echo html::select('assignedTo', $users, $story->reviewedBy, 'class="form-control chosen"');?>
<?php if(!$this->story->checkForceReview()):?>
<span class="input-group-addon">
<?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview' {$needReview}");?>
module/story/view/linkstory.html.php
+2 -1
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include './header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('linkType', $type);?>
<div class='main-content' id='mainContent'>
<div class='main-header'>
@@ -25,7 +26,7 @@
<div id='queryBox' class='show divider'></div>
<form method='post' target='hiddenwin' id='linkStoryForm' class='main-table table-story'>
<?php if($stories2Link):?>
<table class='table' id='storyList'>
<table class='table tablesorter' id='storyList'>
<thead>
<tr>
<th class='c-id'>
module/testcase/view/linkcases.html.php
+2 -1
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<div id="mainContent" class="main-content">
<div class='main-header'>
<h2>
@@ -22,7 +23,7 @@
<div id='queryBox' class='show divider'></div>
<?php if($cases2Link):?>
<form class='main-table' method='post' target='hiddenwin' id='linkCasesForm' data-ride='table'>
<table class='table' id='caseList'>
<table class='table tablesorter' id='caseList'>
<thead>
<tr>
<th class='c-id'>
module/testsuite/view/linkcase.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<div class="table-header">
<i class="icon-unlink"></i> &nbsp;<strong><?php echo $lang->testsuite->unlinkedCases;?></strong> (<?php echo $pager->recTotal;?>)
</div>
<table class='table' id='testcaseList'>
<table class='table tablesorter' id='testcaseList'>
<thead>
<tr>
<th class='w-id'>
module/testtask/view/linkcase.html.php
+2 -1
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php common::printBack($this->session->testtaskList, 'btn btn-link');?>
@@ -68,7 +69,7 @@
<div class="cell show" id="queryBox"></div>
<div id='mainContent'>
<form class='main-table table-case' data-ride='table' method='post'>
<table class='table'>
<table class='table tablesorter'>
<div class="table-header">
<i class="icon-unlink"></i> &nbsp;<strong><?php echo $lang->testtask->unlinkedCases;?></strong> (<?php echo $pager->recTotal;?>)
</div>