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

* finish task #1971,1961.

Browse Source
This commit is contained in:
wangyidong
2014-07-23 09:36:03 +00:00
parent c79840dfa9
commit e1d1c354fb
55 changed files with 227 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
-1
View File
@@ -316,7 +316,6 @@ class bug extends control
$this->view->stories = $stories;
$this->view->projects = $this->product->getProjectPairs($productID, $params = 'nodeleted');
$this->view->builds = $builds;
$this->view->tasks = $this->loadModel('task')->getProjectTaskPairs($projectID);
$this->view->moduleID = $moduleID;
$this->view->projectID = $projectID;
$this->view->taskID = $taskID;
module/bug/js/common.js
+8 -7
View File
@@ -61,7 +61,7 @@ function loadAll(productID)
function loadProductModules(productID)
{
link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&rootModuleID=0&returnType=html&needManage=true');
$('#moduleIdBox').load(link);
$('#moduleIdBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
}
/**
@@ -87,7 +87,7 @@ function loadProductStories(productID)
function loadProductProjects(productID)
{
link = createLink('product', 'ajaxGetProjects', 'productID=' + productID + '&projectID=' + oldProjectID);
$('#projectIdBox').load(link);
$('#projectIdBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
}
/**
@@ -100,7 +100,7 @@ function loadProductProjects(productID)
function loadProductplans(productID)
{
link = createLink('productplan', 'ajaxGetProductplans', 'productID=' + productID);
$('#planIdBox').load(link);
$('#planIdBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
}
/**
@@ -120,9 +120,9 @@ function loadProductBuilds(productID)
}
else
{
$('#openedBuildBox').load(link);
$('#openedBuildBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild);
$('#resolvedBuildBox').load(link);
$('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
}
}
@@ -196,10 +196,10 @@ function loadProjectBuilds(projectID)
else
{
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild);
$('#openedBuildBox').load(link);
$('#openedBuildBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild);
$('#resolvedBuildBox').load(link);
$('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
}
}
@@ -231,6 +231,7 @@ function setStories(moduleID, productID)
*/
function notice()
{
$('#buildBoxActions').empty();
if($('#openedBuild').find('option').length <= 1)
{
var html = '';
module/bug/js/create.js
+1 -3
View File
@@ -8,9 +8,7 @@
function loadAssignedTo(projectID)
{
link = createLink('bug', 'ajaxLoadAssignedTo', 'projectID=' + projectID + '&selectedUser=' + $('#assignedTo').val());
$('#assignedToBox').load(link, function(){
$('#assignedTo').chosen(defaultChosenOptions);
});
$('#assignedToBox').load(link, function(){$('#assignedTo').chosen(defaultChosenOptions);});
}
/**
module/bug/view/activate.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<table class='table table-form'>
<tr>
<th class='w-70px'><?php echo $lang->bug->assignedTo;?></th>
<td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control'");?></td><td></td>
<td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control chosen'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->bug->openedBuild;?></th>
module/bug/view/batchcreate.html.php
+5 -5
View File
@@ -23,9 +23,9 @@
<table class='table table-fixed table-form'>
<thead>
<tr>
<th class='w-30px'> <?php echo $lang->idAB;?></th>
<th class='w-100px'> <?php echo $lang->bug->module;?></th>
<th class='w-100px'> <?php echo $lang->bug->project;?></th>
<th class='w-50px'> <?php echo $lang->idAB;?></th>
<th class='w-120px'> <?php echo $lang->bug->module;?></th>
<th class='w-130px'> <?php echo $lang->bug->project;?></th>
<th class='w-150px'><?php echo $lang->bug->openedBuild;?> <span class='required'></span></th>
<th><?php echo $lang->bug->title;?> <span class='required'></span></th>
<th> <?php echo $lang->bug->steps;?></th>
@@ -38,8 +38,8 @@
<?php for($i = 0; $i < $config->bug->batchCreate; $i++):?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
<td><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
<td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
<td><?php echo html::input("titles[$i]", '', 'class=form-control');?></td>
<td>
module/bug/view/batchedit.html.php
+9 -9
View File
@@ -19,17 +19,17 @@
</div>
<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "productID=$productID");?>">
<table class='table table-fixed table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-30px'><?php echo $lang->idAB;?></th>
<th class='w-90px'><?php echo $lang->bug->type;?></th>
<th class='w-60px'><?php echo $lang->bug->severityAB;?></th>
<th class='w-60px'><?php echo $lang->bug->pri;?></th>
<th class='w-110px'><?php echo $lang->bug->type;?></th>
<th class='w-70px'><?php echo $lang->bug->severityAB;?></th>
<th class='w-70px'><?php echo $lang->bug->pri;?></th>
<th><?php echo $lang->bug->title;?> <span class='required'></span></th>
<th class='w-100px'><?php echo $lang->bug->assignedTo;?></th>
<th class='w-80px'><?php echo $lang->bug->status;?></th>
<th class='w-100px'><?php echo $lang->bug->resolvedByAB;?></th>
<th class='w-150px'><?php echo $lang->bug->assignedTo;?></th>
<th class='w-90px'><?php echo $lang->bug->status;?></th>
<th class='w-150px'><?php echo $lang->bug->resolvedByAB;?></th>
<th class='w-180px'><?php echo $lang->bug->resolutionAB;?></th>
</tr>
</thead>
@@ -49,9 +49,9 @@
<td><?php echo html::select("severities[$bugID]", (array)$lang->bug->severityList, $bugs[$bugID]->severity, 'class=form-control');?></td>
<td><?php echo html::select("pris[$bugID]", (array)$lang->bug->priList, $bugs[$bugID]->pri, 'class=form-control');?></td>
<td><?php echo html::input("titles[$bugID]", $bugs[$bugID]->title, 'class=form-control');?></td>
<td><?php echo html::select("assignedTos[$bugID]", $users, $bugs[$bugID]->assignedTo, 'class=form-control');?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("assignedTos[$bugID]", $users, $bugs[$bugID]->assignedTo, "class='form-control chosen'");?></td>
<td><?php echo html::select("statuses[$bugID]", (array)$lang->bug->statusList, $bugs[$bugID]->status, 'class=form-control');?></td>
<td><?php echo html::select("resolvedBys[$bugID]", $users, $bugs[$bugID]->resolvedBy, 'class=form-control');?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("resolvedBys[$bugID]", $users, $bugs[$bugID]->resolvedBy, "class='form-control chosen'");?></td>
<td>
<table class='w-p100'>
<tr>
module/bug/view/create.html.php
+6 -6
View File
@@ -33,12 +33,12 @@ js::set('refresh', $lang->refresh);
<tr>
<th class='w-110px'><?php echo $lang->bug->lblProductAndModule;?></th>
<td class='w-p25-f'>
<?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value) class='form-control' autocomplete='off'");?>
<?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value) class='form-control chosen' autocomplete='off'");?>
</td>
<td>
<div class='input-group w-p25-f' id='moduleIdBox'>
<?php
echo html::select('module', $moduleOptionMenu, $moduleID, "onchange='loadModuleRelated()' class='form-control'");
echo html::select('module', $moduleOptionMenu, $moduleID, "onchange='loadModuleRelated()' class='form-control chosen'");
if(count($moduleOptionMenu) == 1)
{
echo "<span class='input-group-addon'>";
@@ -53,7 +53,7 @@ js::set('refresh', $lang->refresh);
</tr>
<tr>
<th><?php echo $lang->bug->project;?></th>
<td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, 'class=form-control onchange=loadProjectRelated(this.value) autocomplete="off"');?></span></td>
<td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProjectRelated(this.value)' autocomplete='off'");?></span></td>
</tr>
<tr>
<th><?php echo $lang->bug->openedBuild;?></th>
@@ -82,12 +82,12 @@ js::set('refresh', $lang->refresh);
<tr>
<th><?php echo $lang->bug->lblStory;?></th>
<td colspan='2'>
<span id='storyIdBox'><?php echo html::select('story', $stories, $storyID, "class='form-control'");?></span>
<span id='storyIdBox'><?php echo html::select('story', $stories, $storyID, "class='form-control chosen'");?></span>
</td>
</tr>
<tr>
<th><?php echo $lang->bug->task;?></th>
<td colspan='2'><span id='taskIdBox'><?php echo html::select('task', $tasks, $taskID, "class='form-control'");?></span></td>
<td colspan='2'><span id='taskIdBox'><?php echo html::select('task', '', $taskID, "class='form-control chosen'");?></span></td>
</tr>
<tr>
<th><?php echo $lang->bug->lblTypeAndSeverity;?></th>
@@ -116,7 +116,7 @@ js::set('refresh', $lang->refresh);
</td>
<td class='text-top'>
<?php
if($contactLists) echo html::select('', $contactLists, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\"");
if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");
?>
</td>
</tr>
module/bug/view/customfields.html.php
-48
View File
@@ -1,48 +0,0 @@
<?php
/**
* The custom seting fields view of bug module of ZenTaoPMS.
*
* @copyright Copyright 2009-2013 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package product
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['bug']);?></span>
<strong><?php echo $lang->bug->customFields;?></strong>
<small class='text-muted'><?php echo html::icon($lang->icons['customFields']);?></small>
</div>
</div>
<form class='form-condensed' method='post' class='mt-20px'>
<table class='table table-form' align='center'>
<tr>
<th colspan='2' class='text-left'><?php echo $lang->bug->lblAllFields;?></th>
<th colspan='2' class='text-left'><?php echo $lang->bug->lblCustomFields;?></th>
</tr>
<tr>
<td>
<?php
echo html::select('allFields[]', $allFields, '', 'class=form-control size=10 multiple');
echo html::select('defaultFields[]', $defaultFields, '', 'class=hidden');
?>
</td>
<td class='text-middle w-80px'>
<a class='btn btn-block' onclick="addItem('allFields', 'customFields')"><i class="icon-chevron-right"></i></a>
<a class='btn btn-block' onclick="delItem('customFields')"><i class="icon-chevron-left"></i></a>
</td>
<td><?php echo html::select('customFields[]', $customFields, '', 'class=form-control size=10 multiple');?></td>
<td class='text-middle w-80px'>
<a class='btn btn-block' onclick="upItem('customFields')"><i class="icon-chevron-up"></i></a>
<a class='btn btn-block' onclick="downItem('customFields')"><i class="icon-chevron-down"></i></a>
<a class='btn btn-block' onclick='restoreDefault()'><?php echo $lang->bug->restoreDefault;?></a>
</td>
</tr>
<tr><td></td><td><?php echo html::submitButton('', 'onclick=selectItem("customFields")', 'btn-block btn-primary');?></td></tr>
</table>
</form>
<?php include '../../common/view/footer.lite.html.php';?>
module/bug/view/edit.html.php
+7 -7
View File
@@ -73,19 +73,19 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<legend><?php echo $lang->bug->legendBasicInfo;?></legend>
<table class='table table-form'>
<tr>
<th class='w-60px'><?php echo $lang->bug->product;?></th>
<td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control'");?></td>
<th class='w-80px'><?php echo $lang->bug->product;?></th>
<td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->bug->module;?></th>
<td>
<span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control'");?></span>
<span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");?></span>
</td>
</tr>
<tr>
<th><?php echo $lang->bug->productplan;?></th>
<td>
<span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, "class='form-control'");?></span>
<span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, "class='form-control chosen'");?></span>
</td>
</tr>
<tr>
@@ -135,7 +135,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<legend><?php echo $lang->bug->legendPrjStoryTask;?></legend>
<table class='table table-form'>
<tr>
<th class='w-60px'><?php echo $lang->bug->project;?></th>
<th class='w-80px'><?php echo $lang->bug->project;?></th>
<td><span id='projectIdBox'><?php echo html::select('project', $projects, $bug->project, 'class=form-control onchange=loadProjectRelated(this.value)');?></span></td>
</tr>
<tr>
@@ -154,7 +154,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<legend><?php echo $lang->bug->legendLife;?></legend>
<table class='table table-form'>
<tr>
<th class='w-60px'><?php echo $lang->bug->openedBy;?></th>
<th class='w-80px'><?php echo $lang->bug->openedBy;?></th>
<td><?php echo $users[$bug->openedBy];?></td>
</tr>
<tr>
@@ -195,7 +195,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<legend><?php echo $lang->bug->legendMisc;?></legend>
<table class='table table-form'>
<tr>
<th class='w-60px'><?php echo $lang->bug->linkBug;?></th>
<th class='w-80px'><?php echo $lang->bug->linkBug;?></th>
<td><?php echo html::input('linkBug', $bug->linkBug, 'class="form-control"');?></td>
</tr>
<tr>
module/bug/view/resolve.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
</tr>
<tr>
<th><?php echo $lang->bug->resolvedBuild;?></th>
<td><?php echo html::select('resolvedBuild', $builds, '', "class='form-control'");?></td>
<td><?php echo html::select('resolvedBuild', $builds, '', "class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->bug->resolvedDate;?></th>
module/build/view/create.html.php
+2 -2
View File
@@ -24,7 +24,7 @@
<table class='table table-form'>
<tr>
<th class='w-110px'><?php echo $lang->build->product;?></th>
<td class='w-p25-f'><?php echo html::select('product', $products, '', "class='form-control'");?></td><td></td>
<td class='w-p25-f'><?php echo html::select('product', $products, '', "class='form-control chosen'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->build->name;?></th>
@@ -39,7 +39,7 @@
</tr>
<tr>
<th><?php echo $lang->build->builder;?></th>
<td><?php echo html::select('builder', $users, $app->user->account, 'class="form-control"');?></td>
<td><?php echo html::select('builder', $users, $app->user->account, 'class="form-control chosen"');?></td>
</tr>
<tr>
<th><?php echo $lang->build->date;?></th>
module/build/view/edit.html.php
+2 -2
View File
@@ -25,7 +25,7 @@
<table class='table table-form'>
<tr>
<th class='w-110px'><?php echo $lang->build->product;?></th>
<td class='w-p25-f'><?php echo html::select('product', $products, $build->product, "class='form-control'");?></td><td></td>
<td class='w-p25-f'><?php echo html::select('product', $products, $build->product, "class='form-control chosen'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->build->name;?></th>
@@ -33,7 +33,7 @@
</tr>
<tr>
<th><?php echo $lang->build->builder;?></th>
<td><?php echo html::select('builder', $users, $build->builder, 'class="form-control"');?></td>
<td><?php echo html::select('builder', $users, $build->builder, 'class="form-control chosen"');?></td>
</tr>
<tr>
<th><?php echo $lang->build->date;?></th>
module/company/view/dynamic.html.php
+3 -3
View File
@@ -26,9 +26,9 @@ var browseType = '<?php echo $browseType;?>';
echo '<li id="thismonth">' . html::a(inlink('dynamic', "browseType=thismonth"), $lang->action->dynamic->thisMonth) . '</li>';
echo '<li id="lastmonth">' . html::a(inlink('dynamic', "browseType=lastmonth"), $lang->action->dynamic->lastMonth) . '</li>';
echo '<li id="all">' . html::a(inlink('dynamic', "browseType=all"), $lang->action->dynamic->all) . '</li>';
echo "<li id='account'>" . html::select('account', $users, $account, 'onchange=changeUser(this.value) class="form-control"') . '</li>';
echo "<li id='product'>" . html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control"') . '</li>';
echo "<li id='project' style='margin-right: 10px;'>" . html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control"') . '</li>';
echo "<li id='account' class='w-120px'>" . html::select('account', $users, $account, 'onchange=changeUser(this.value) class="form-control chosen"') . '</li>';
echo "<li id='product' class='w-180px'>" . html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control chosen"') . '</li>';
echo "<li id='project' class='w-180px' style='margin-right: 10px;'>" . html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control chosen"') . '</li>';
echo "<li id='bysearchTab'>" . html::a('#', '<i class="icon-search icon"></i>&nbsp;' . $lang->action->dynamic->search) . "</li>";
?>
</ul>
module/doc/js/common.js
+1 -1
View File
@@ -2,7 +2,7 @@
function loadProducts(project)
{
link = createLink('project', 'ajaxGetProducts', 'projectID=' + project);
$('#productBox').load(link);
$('#productBox').load(link, function(){$('#productBox').find('select').chosen(defaultChosenOptions)});
}
/* Set doc type. */
module/doc/js/create.js
+1 -1
View File
@@ -1 +1 @@
loadProducts($('#project').val());
module/doc/view/create.html.php
+4 -4
View File
@@ -25,21 +25,21 @@
<?php if($libID == 'product'):?>
<tr>
<th class='w-80px'><?php echo $lang->doc->product;?></th>
<td class='w-p25-f'><?php echo html::select('product', $products, $productID, "class='form-control'");?></td><td></td>
<td class='w-p25-f'><?php echo html::select('product', $products, $productID, "class='form-control chosen'");?></td><td></td>
</tr>
<?php elseif($libID == 'project'):?>
<tr>
<th class='w-80px'><?php echo $lang->doc->project;?></th>
<td class='w-p25-f'><?php echo html::select('project', $projects, $projectID, "class='form-control' onchange=loadProducts(this.value);");?></td><td></td>
<td class='w-p25-f'><?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange=loadProducts(this.value)");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->doc->product;?></th>
<td class='w-p25-f'><span id='productBox'><?php echo html::select('product', $products, '', "class='form-control'");?></span></td><td></td>
<td class='w-p25-f'><span id='productBox'><?php echo html::select('product', $products, '', "class='form-control chosen'");?></span></td><td></td>
</tr>
<?php endif;?>
<tr>
<th class='w-80px'><?php echo $lang->doc->module;?></th>
<td><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
<td><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->doc->type;?></th>
module/doc/view/edit.html.php
+1 -1
View File
@@ -31,7 +31,7 @@ $(document).ready(function()
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->doc->module;?></th>
<td class='w-p25-f'><?php echo html::select('module', $moduleOptionMenu, $doc->module, "class='form-control'");?></td><td></td>
<td class='w-p25-f'><?php echo html::select('module', $moduleOptionMenu, $doc->module, "class='form-control chosen'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->doc->type;?></th>
module/file/model.php
+3 -3
View File
@@ -289,8 +289,8 @@ class fileModel extends model
while(($line = fgets($handle)) !== false)
{
$line = trim($line);
$line = preg_replace_callback('/(\"{2,})(\,+)/', array($this, 'removeInterference'), $line);
$line = str_replace('""', '"', $line);
$line = str_replace(',"",', ',,', $line);
$line = preg_replace_callback('/(\"{2,})(\,+)/U', array($this, 'removeInterference'), $line);
/* if only one column then line is the data. */
if(strpos($line, ',') === false and $col == -1)
@@ -378,6 +378,6 @@ class fileModel extends model
*/
private function removeInterference($matchs)
{
return $matchs[1] . str_replace(',', '&comma;', $matchs[2]);
return str_replace('""', '"', $matchs[1]) . str_replace(',', '&comma;', $matchs[2]);
}
}
module/group/view/privbygroup.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
<?php echo html::a(inlink('managePriv', sprintf($params, 'other')), $lang->group->other);?>
</li>
<li><?php echo html::select('version', $this->lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control'");?></li>
<li class='w-150px'><?php echo html::select('version', $this->lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control chosen'");?></li>
</ul>
</div>
<table class='table table-hover table-striped table-bordered table-form'>
module/mail/view/test.html.php
+1 -1
View File
@@ -29,7 +29,7 @@ if(isset($error))
<form class='form-condensed' method='post' target='resultWin'>
<table class='table table-form'>
<tr>
<td><?php echo html::select('to', $users, $app->user->account, "class='form-control'");?></td>
<td><?php echo html::select('to', $users, $app->user->account, "class='form-control chosen'");?></td>
<td class='text-left'>
<?php
echo html::submitButton($lang->mail->test);
module/product/view/batchedit.html.php
+7 -7
View File
@@ -17,15 +17,15 @@
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' action='<?php echo inLink('batchEdit');?>'>
<table class='table table-fixed table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th> <?php echo $lang->product->name;?> <span class='required'></span></th>
<th class='w-150px'><?php echo $lang->product->code;?> <span class='required'></span></th>
<th class='w-110px'><?php echo $lang->product->PO;?></th>
<th class='w-110px'><?php echo $lang->product->QD;?></th>
<th class='w-110px'><?php echo $lang->product->RD;?></th>
<th class='w-150px'><?php echo $lang->product->PO;?></th>
<th class='w-150px'><?php echo $lang->product->QD;?></th>
<th class='w-150px'><?php echo $lang->product->RD;?></th>
<th class='w-100px'><?php echo $lang->product->status;?></th>
</tr>
</thead>
@@ -34,9 +34,9 @@
<td><?php echo sprintf('%03d', $productID) . html::hidden("productIDList[$productID]", $productID);?></td>
<td><?php echo html::input("names[$productID]", $products[$productID]->name, "class='form-control'");?></td>
<td><?php echo html::input("codes[$productID]", $products[$productID]->code, "class='form-control'");?></td>
<td><?php echo html::select("POs[$productID]", $poUsers, $products[$productID]->PO, "class='form-control'");?></td>
<td><?php echo html::select("QDs[$productID]", $qdUsers, $products[$productID]->QD, "class='form-control'");?></td>
<td><?php echo html::select("RDs[$productID]", $rdUsers, $products[$productID]->RD, "class='form-control'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("POs[$productID]", $poUsers, $products[$productID]->PO, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("QDs[$productID]", $qdUsers, $products[$productID]->QD, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("RDs[$productID]", $rdUsers, $products[$productID]->RD, "class='form-control chosen'");?></td>
<td><?php echo html::select("statuses[$productID]", $lang->product->statusList, $products[$productID]->status, "class='form-control'");?></td>
</tr>
<?php endforeach;?>
module/product/view/dynamic.html.php
+1 -1
View File
@@ -23,7 +23,7 @@
echo '<li id="thismonth">' . html::a(inlink('dynamic', "productID=$productID&type=thismonth"), $lang->action->dynamic->thisMonth) . '</li>';
echo '<li id="lastmonth">' . html::a(inlink('dynamic', "productID=$productID&type=lastmonth"), $lang->action->dynamic->lastMonth) . '</li>';
echo '<li id="all">' . html::a(inlink('dynamic', "productID=$productID&type=all"), $lang->action->dynamic->all) . '</li>';
echo "<li id='account'>" . html::select('account', $users, $account, "onchange='changeUser(this.value,$productID)' class='form-control'") . '</li>';
echo "<li id='account' class='w-150px'>" . html::select('account', $users, $account, "onchange='changeUser(this.value,$productID)' class='form-control chosen'") . '</li>';
?>
</nav>
</div>
module/project/view/batchedit.html.php
+5 -5
View File
@@ -18,14 +18,14 @@
</div>
</div>
<form class='form-condensed' method='post' action='<?php echo inLink('batchEdit');?>'>
<table class='table table-fixed table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr class='text-center'>
<th class='w-30px'> <?php echo $lang->idAB;?></th>
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th> <?php echo $lang->project->name;?> <span class='required'></span></th>
<th class='w-150px'><?php echo $lang->project->code;?> <span class='required'></span></th>
<th class='w-110px'> <?php echo $lang->project->PM;?></th>
<th class='w-100px'> <?php echo $lang->project->status;?></th>
<th class='w-150px'><?php echo $lang->project->PM;?></th>
<th class='w-100px'><?php echo $lang->project->status;?></th>
<th class='w-110px'><?php echo $lang->project->begin;?> <span class='required'></span></th>
<th class='w-110px'><?php echo $lang->project->end;?> <span class='required'></span></th>
<th class='w-150px'> <?php echo $lang->project->days;?></th>
@@ -36,7 +36,7 @@
<td><?php echo sprintf('%03d', $projectID) . html::hidden("projectIDList[$projectID]", $projectID);?></td>
<td><?php echo html::input("names[$projectID]", $projects[$projectID]->name, "class='form-control'");?></td>
<td><?php echo html::input("codes[$projectID]", $projects[$projectID]->code, "class='form-control'");?></td>
<td><?php echo html::select("PMs[$projectID]", $pmUsers, $projects[$projectID]->PM, 'class=form-control');?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("PMs[$projectID]", $pmUsers, $projects[$projectID]->PM, "class='form-control chosen'");?></td>
<td><?php echo html::select("statuses[$projectID]", $lang->project->statusList, $projects[$projectID]->status, 'class=form-control');?></td>
<td><?php echo html::input("begins[$projectID]", $projects[$projectID]->begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?></td>
<td><?php echo html::input("ends[$projectID]", $projects[$projectID]->end, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?></td>
module/project/view/importbug.html.php
+1 -1
View File
@@ -52,7 +52,7 @@ var browseType = '<?php echo $browseType;?>';
<td class='text-left nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
<td><?php echo $lang->bug->statusList[$bug->status];?></td>
<td><?php echo html::select("pri[$bug->id]", $lang->task->priList, 3, "class='input-sm form-control'");?></td>
<td><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control chosen'");?></td>
<td><?php echo html::input("estimate[$bug->id]", '', 'size=4 class="input-sm form-control"');?></td>
</tr>
<?php endforeach;?>
module/project/view/importtask.html.php
+2 -2
View File
@@ -16,10 +16,10 @@
<div class='heading'>
<span class='prefix pull-left'><?php echo html::icon($lang->icons['task']);?></span>
<strong class='pull-left'><small class='text-muted'><?php echo html::icon($lang->icons['import']);?></small> <?php echo $lang->project->importTask;?></strong>
<div class='input-group pull-left'>
<div class='input-group pull-left' style='font-weight:normal;'>
<?php $projects = array(0 => $lang->project->fromproject) + $projects;?>
<span class='input-group-addon'><?php echo $lang->project->selectProject;?></span>
<?php echo html::select('fromproject', $projects, $fromProject, "onchange='reload($projectID, this.value)' class='form-control'");?>
<?php echo html::select('fromproject', $projects, $fromProject, "onchange='reload($projectID, this.value)' class='form-control chosen'");?>
</div>
</div>
</div>
module/release/view/create.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<th><?php echo $lang->release->build;?></th>
<td>
<?php
echo html::select('build', $builds, '', "class='form-control' onchange=loadStoriesAndBugs(this.value,$productID)");
echo html::select('build', $builds, '', "class='form-control chosen' onchange=loadStoriesAndBugs(this.value,$productID)");
?>
</td>
<td><?php if(empty($builds)) echo $lang->build->notice; ?></td>
module/release/view/edit.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
</tr>
<tr>
<th><?php echo $lang->release->build;?></th>
<td><?php echo html::select('build', $builds, $release->build, "class='form-control' onchange=loadStoriesAndBugs(this.value,$release->product)"); ?></td><td></td>
<td><?php echo html::select('build', $builds, $release->build, "class='form-control chosen' onchange=loadStoriesAndBugs(this.value,$release->product)"); ?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->release->date;?></th>
module/story/js/batchcreate.js
+8 -1
View File
@@ -4,7 +4,14 @@ $(document).on('click', '.chosen-with-drop', function()
if($(select).val() == 'same')
{
var index = $(select).parents('td').index();
var value = $(select).parents('tr').prev('tr').find('td').eq(index).find('select').val();
var row = $(select).parents('tr').index();
var table = $(select).parents('tr').parent();
var value = '';
for(i = row - 1; i >= 0; i--)
{
value = $(table).find('tr').eq(i).find('td').eq(index).find('select').val();
if(value != 'same') break;
}
$(select).val(value);
$(select).trigger("chosen:updated");
}
module/story/view/batchcreate.html.php
+3 -3
View File
@@ -18,7 +18,7 @@
</div>
</div>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr class='text-center'>
<th class='w-30px'><?php echo $lang->idAB;?></th>
@@ -36,8 +36,8 @@
<?php $planID = $i == 0 ? '' : 'same';?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td class='text-left'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
<td><?php echo html::input("title[$i]", $storyTitle, "class='form-control'");?></td>
<td>
<?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control'");?>
module/story/view/batchedit.html.php
+5 -5
View File
@@ -21,7 +21,7 @@
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "from=storyBatchEdit")?>">
<table class='table table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr class='text-center'>
<th class='w-30px'> <?php echo $lang->idAB;?></th>
@@ -33,15 +33,15 @@
<th class='w-100px'> <?php echo $lang->story->source;?></th>
<th class='w-80px'> <?php echo $lang->story->status;?></th>
<th class='w-100px'> <?php echo $lang->story->stageAB;?></th>
<th class='w-120px'><?php echo $lang->story->closedBy;?></th>
<th class='w-130px'><?php echo $lang->story->closedBy;?></th>
<th><?php echo $lang->story->closedReason;?></th>
</tr>
</thead>
<?php foreach($storyIDList as $storyID):?>
<tr class='text-center'>
<td><?php echo $storyID . html::hidden("storyIDList[$storyID]", $storyID);?></td>
<td class='text-left'><?php echo html::select("modules[$storyID]", $moduleOptionMenus[$stories[$storyID]->product], $stories[$storyID]->module, "class='form-control chosen'");?></td>
<td class='text-left'><?php echo html::select("plans[$storyID]", $productPlans[$stories[$storyID]->product], $stories[$storyID]->plan, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("modules[$storyID]", $moduleOptionMenus[$stories[$storyID]->product], $stories[$storyID]->module, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("plans[$storyID]", $productPlans[$stories[$storyID]->product], $stories[$storyID]->plan, "class='form-control chosen'");?></td>
<td><?php echo html::input("titles[$storyID]", $stories[$storyID]->title, 'class=form-control'); ?></td>
<td><?php echo html::input("estimates[$storyID]", $stories[$storyID]->estimate, 'class=form-control'); ?></td>
<td><?php echo html::select("pris[$storyID]", (array)$lang->story->priList, $stories[$storyID]->pri, 'class=form-control');?></td>
@@ -55,7 +55,7 @@
<?php endif;?>
<?php if($stories[$storyID]->status == 'closed'):?>
<td class='text-left'><?php echo html::select("closedBys[$storyID]", $users, $stories[$storyID]->closedBy, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("closedBys[$storyID]", $users, $stories[$storyID]->closedBy, "class='form-control chosen'");?></td>
<?php else:?>
<td class='text-left'><?php echo html::select("closedBys[$storyID]", $users, $stories[$storyID]->closedBy, 'class="form-control" disabled="disabled"');?></td>
<?php endif;?>
module/story/view/edit.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<legend><?php echo $lang->story->legendBasicInfo;?></legend>
<table class='table table-form'>
<tr>
<th class='w-70px'><?php echo $lang->story->product;?></th>
<th class='w-80px'><?php echo $lang->story->product;?></th>
<td><?php echo html::select('product', $products, $story->product, 'class="form-control chosen" onchange="loadProduct(this.value)";');?></td>
</tr>
<tr>
module/task/js/batchcreate.js
+8 -1
View File
@@ -47,7 +47,14 @@ $(document).on('click', '.chosen-with-drop', function()
if($(select).val() == 'ditto')
{
var index = $(select).parents('td').index();
var value = $(select).parents('tr').prev('tr').find('td').eq(index).find('select').val();
var row = $(select).parents('tr').index();
var table = $(select).parents('tr').parent();
var value = '';
for(i = row - 1; i >= 0; i--)
{
value = $(table).find('tr').eq(i).find('td').eq(index).find('select').val();
if(value != 'ditto') break;
}
$(select).val(value);
$(select).trigger("chosen:updated");
}
module/task/js/edit.js
+1 -1
View File
@@ -62,7 +62,7 @@ function loadProjectStories(projectID)
function loadProjectMembers(projectID)
{
link = createLink('project', 'ajaxGetMembers', 'projectID=' + projectID);
$('#assignedToIdBox').load(link);
$('#assignedToIdBox').load(link, function(){$('#assignedToIdBox').find('select').chosen(defaultChosenOptions)});
}
/* empty function. */
module/task/view/batchcreate.html.php
+5 -5
View File
@@ -20,15 +20,15 @@
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr class='text-center'>
<th class='w-30px'><?php echo $lang->idAB;?></th>
<th class='w-150px'><?php echo $lang->task->module?></th>
<th class='w-150px'><?php echo $lang->task->story;?></th>
<th class='w-200px'><?php echo $lang->task->story;?></th>
<th><?php echo $lang->task->name;?> <span class='required'></span></th>
<th class='w-80px'><?php echo $lang->typeAB;?> <span class='required'></span></th>
<th class='w-90px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-150px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-50px'><?php echo $lang->task->estimateAB;?></th>
<th class='w-p20'><?php echo $lang->task->desc;?></th>
<th class='w-70px'><?php echo $lang->task->pri;?></th>
@@ -58,7 +58,7 @@
<?php $pri = 3;?>
<tr>
<td class='text-center'><?php echo $i+1;?></td>
<td><?php echo html::select("module[$i]", $modules, $module, "class='form-control chosen'")?></td>
<td style='overflow:visible'><?php echo html::select("module[$i]", $modules, $module, "class='form-control chosen'")?></td>
<td style='overflow: visible'>
<div class='input-group'>
<?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
@@ -69,7 +69,7 @@
</td>
<td><?php echo html::input("name[$i]", '', 'class=form-control');?></td>
<td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
<td><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
<td style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
<td><?php echo html::input("estimate[$i]", '', 'class=form-control text-center');?></td>
<td>
<?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control'");?>
module/task/view/batchedit.html.php
+7 -7
View File
@@ -19,20 +19,20 @@
</div>
<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
<table class='table table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-30px'><?php echo $lang->idAB;?></th>
<th> <?php echo $lang->task->name?> <span class='required'></span></th>
<th class='w-150px'><?php echo $lang->task->module?></th>
<th class='w-100px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-150px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-80px'><?php echo $lang->typeAB;?> <span class='required'></span></th>
<th class='w-100px'><?php echo $lang->task->status;?></th>
<th class='w-70px'><?php echo $lang->task->pri;?></th>
<th class='w-40px'><?php echo $lang->task->estimateAB;?> <span class='required'></span></th>
<th class='w-60px'><?php echo $lang->task->consumedThisTime?> <span class='required'></span></th>
<th class='w-40px'><?php echo $lang->task->leftAB?> <span class='required'></span></th>
<th class='w-100px'><?php echo $lang->task->finishedBy;?></th>
<th class='w-150px'><?php echo $lang->task->finishedBy;?></th>
<th class='w-100px'><?php echo $lang->task->closedBy;?></th>
<th class='w-100px'><?php echo $lang->task->closedReason;?></th>
</tr>
@@ -48,16 +48,16 @@
<tr class='text-center'>
<td><?php echo $taskID . html::hidden("taskIDList[$taskID]", $taskID);?></td>
<td><?php echo html::input("names[$taskID]", $tasks[$taskID]->name, 'class=form-control');?></td>
<td class='text-left'><?php echo html::select("modules[$taskID]", $modules, $tasks[$taskID]->module, "class='form-control chosen'")?></td>
<td class='text-left'><?php echo html::select("assignedTos[$taskID]", $members, $tasks[$taskID]->assignedTo, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("modules[$taskID]", $modules, $tasks[$taskID]->module, "class='form-control chosen'")?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("assignedTos[$taskID]", $members, $tasks[$taskID]->assignedTo, "class='form-control chosen'");?></td>
<td><?php echo html::select("types[$taskID]", $lang->task->typeList, $tasks[$taskID]->type, 'class=form-control');?></td>
<td><?php echo html::select("statuses[$taskID]", $lang->task->statusList, $tasks[$taskID]->status, 'class=form-control');?></td>
<td><?php echo html::select("pris[$taskID]", (array)$lang->task->priList, $tasks[$taskID]->pri, 'class=form-control');?></td>
<td><?php echo html::input("estimates[$taskID]", $tasks[$taskID]->estimate, "class='form-control text-center'");?></td>
<td><?php echo html::input("consumeds[$taskID]", '', "class='form-control text-center'");?></td>
<td><?php echo html::input("lefts[$taskID]", $tasks[$taskID]->left, "class='form-control text-center'");?></td>
<td class='text-left'><?php echo html::select("finishedBys[$taskID]", $members, $tasks[$taskID]->finishedBy, "class='form-control chosen'");?></td>
<td class='text-left'><?php echo html::select("closedBys[$taskID]", $members, $tasks[$taskID]->closedBy, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("finishedBys[$taskID]", $members, $tasks[$taskID]->finishedBy, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("closedBys[$taskID]", $members, $tasks[$taskID]->closedBy, "class='form-control chosen'");?></td>
<td><?php echo html::select("closedReasons[$taskID]", $lang->task->reasonList, $tasks[$taskID]->closedReason, 'class=form-control');?></td>
</tr>
<?php endforeach;?>
module/task/view/edit.html.php
+1 -1
View File
@@ -60,7 +60,7 @@
<legend><?php echo $lang->task->legendBasic;?></legend>
<table class='table table-form'>
<tr>
<th class='w-70px'><?php echo $lang->task->project;?></th>
<th class='w-80px'><?php echo $lang->task->project;?></th>
<td><?php echo html::select('project', $projects, $task->project, 'class="form-control chosen" onchange="loadAll(this.value)"');?></td>
</tr>
<tr>
module/testcase/control.php
+2
View File
@@ -359,6 +359,7 @@ class testcase extends control
$this->view->position = $position;
$this->view->productID = $productID;
$this->view->story = $storyID ? $this->story->getByID($storyID) : '';
$this->view->stories = $this->story->getProductStoryPairs($productID);
$this->view->productName = $this->products[$productID];
$this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0);
$this->view->currentModuleID = $currentModuleID;
@@ -876,6 +877,7 @@ class testcase extends control
$case = new stdclass();
foreach($columnKey as $key => $field)
{
if(!isset($data[$key])) continue;
$cellValue = $data[$key];
if($field == 'story')
{
module/testcase/js/batchcreate.js
+38 -8
View File
@@ -1,10 +1,12 @@
$(document).ready(function()
{
for(var i = 0; i < testcaseBatchCreateNum; i++)
$(document).on('click', '.chosen-with-drop', function()
{
$("#story" + i).chosen(defaultChosenOptions).bind('liszt:showing_dropdown', function()
var select = $(this).prev('select');
var id = $(select).attr('id');
if(id.indexOf('story') != -1)
{
index = $(this).attr('id').substring(5);
index = id.substring(5);
module = $('#module' + index).val();
if(module == 'same')
{
@@ -18,10 +20,38 @@ $(document).ready(function()
}
}
link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&moduleID=' + module + '&storyID='+ $(this).val() + '&onlyOption=true');
$(this).load(link, function()
$('#story' + index).load(link, function(){$(this).trigger("chosen:updated");});
}
if($(select).val() == 'same')
{
var index = $(select).parents('td').index();
var row = $(select).parents('tr').index();
var table = $(select).parents('tr').parent();
var value = '';
for(i = row - 1; i >= 0; i--)
{
$('#story' + index).trigger("liszt:updated");
});
});
}
value = $(table).find('tr').eq(i).find('td').eq(index).find('select').val();
if(value != 'same') break;
}
$(select).val(value);
$(select).trigger("chosen:updated");
}
});
$(document).on('mousedown', 'select', function()
{
if($(this).val() == 'same')
{
var index = $(this).parents('td').index();
var row = $(this).parents('tr').index();
var table = $(this).parents('tr').parent();
var value = '';
for(i = row - 1; i >= 0; i--)
{
value = $(table).find('tr').eq(i).find('td').eq(index).find('select').val();
if(value != 'same') break;
}
$(this).val(value);
}
});
});
module/testcase/js/common.js
+4 -1
View File
@@ -33,7 +33,8 @@ function loadModuleRelated()
function loadProductModules(productID)
{
link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=case&rootModuleID=0&returnType=html&needManage=true');
$('#moduleIdBox').load(link);
$('#moduleIdBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
setStories();
}
/**
@@ -49,8 +50,10 @@ function setStories()
link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&moduleID=' + moduleID);
$.get(link, function(stories)
{
var value = $('#story').val();
if(!stories) stories = '<select id="story" name="story"></select>';
$('#story').replaceWith(stories);
$('#story').val(value);
$('#story_chosen').remove();
$("#story").chosen(defaultChosenOptions);
});
module/testcase/view/batchcreate.html.php
+5 -6
View File
@@ -11,7 +11,6 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/chosen.html.php';?>
<?php js::set('testcaseBatchCreateNum', $config->testcase->batchCreate);?>
<?php js::set('productID', $productID);?>
<div id='titlebar'>
@@ -25,13 +24,13 @@
</div>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
<table align='center' class='table table-form'>
<table align='center' class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-20px'><?php echo $lang->idAB;?></th>
<th class='w-300px'><?php echo $lang->testcase->module;?></th>
<th class='w-180px'><?php echo $lang->testcase->type;?></th>
<?php if(!$story) echo "<th>{$lang->testcase->story}</th>";?>
<th class='w-400px'><?php echo $lang->testcase->story;?></th>
<th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
</tr>
</thead>
@@ -42,14 +41,14 @@
<?php $pri = 3;?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class=form-control");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
<td><?php echo html::select("type[$i]", $lang->testcase->typeList, $type, "class=form-control");?></td>
<?php if(!$story):?><td class='text-left' style='overflow:visible'><?php echo html::select("story[$i]", '', '', 'class="form-control storySelect"');?></td><?php endif;?>
<td class='text-left' style='overflow:visible'><?php echo html::select("story[$i]", '', '', 'class="form-control chosen"');?></td>
<td><?php echo html::input("title[$i]", '', "class='form-control'");?></td>
</tr>
<?php endfor;?>
<tfoot>
<tr><td colspan='<?php $story ? print '4' : print '5'?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
<tr><td colspan='5' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</tfoot>
</table>
</form>
module/testcase/view/batchedit.html.php
+7 -7
View File
@@ -18,15 +18,15 @@
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
<table class='table table-fixed table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-30px'><?php echo $lang->idAB;?></th>
<th class='w-60px'><?php echo $lang->priAB;?></th>
<th class='w-80px'><?php echo $lang->statusAB;?></th>
<th class='w-140px'><?php echo $lang->testcase->module;?></th>
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th class='w-70px'><?php echo $lang->priAB;?></th>
<th class='w-100px'><?php echo $lang->statusAB;?></th>
<th class='w-150px'><?php echo $lang->testcase->module;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-100px'><?php echo $lang->testcase->type;?></th>
<th class='w-120px'><?php echo $lang->testcase->type;?></th>
<th class='w-340px'><?php echo $lang->testcase->stage;?></th>
</tr>
</thead>
@@ -37,7 +37,7 @@
<td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
<td><?php echo html::select("pris[$caseID]", $lang->testcase->priList, $cases[$caseID]->pri, 'class=form-control');?></td>
<td><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
<td><?php echo html::select("modules[$caseID]", $moduleOptionMenu, $cases[$caseID]->module, "class='form-control'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("modules[$caseID]", $moduleOptionMenu, $cases[$caseID]->module, "class='form-control chosen'");?></td>
<td><?php echo html::input("titles[$caseID]", $cases[$caseID]->title, 'class=form-control'); echo "<span class='star'>*</span>";?></td>
<td><?php echo html::select("types[$caseID]", $lang->testcase->typeList, $cases[$caseID]->type, 'class=form-control');?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
module/testcase/view/create.html.php
+3 -3
View File
@@ -28,12 +28,12 @@
<tr>
<th class='w-80px'><?php echo $lang->testcase->lblProductAndModule;?></th>
<td class='w-p25-f'>
<?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control'");?>
<?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control chosen'");?>
</td>
<td class='w-p25-f'>
<div class='input-group' id='moduleIdBox'>
<?php
echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated();' class='form-control'");
echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated();' class='form-control chosen'");
if(count($moduleOptionMenu) == 1)
{
echo "<span class='input-group-addon'>";
@@ -62,7 +62,7 @@
<th><?php echo $lang->testcase->lblStory;?></th>
<td colspan='3'>
<div class='input-group' id='storyIdBox'>
<?php echo html::select('story', $stories, $storyID, 'class="form-control" onchange=setPreview();');?>
<?php echo html::select('story', $stories, $storyID, 'class="form-control chosen" onchange=setPreview();');?>
<span class='input-group-btn' style='width: 0.01%'>
<?php if($storyID == 0): ?>
<a href='' id='preview' class='btn iframe hidden'><?php echo $lang->preview;?></a>
module/testcase/view/edit.html.php
+3 -3
View File
@@ -90,19 +90,19 @@
<table class='table table-form' cellpadding='0' cellspacing='0'>
<tr>
<th class='w-80px'><?php echo $lang->testcase->product;?></th>
<td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control'");?></td>
<td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->testcase->module;?></th>
<td>
<div class='input-group' id='moduleIdBox'>
<?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control'");?>
<?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->testcase->story;?></th>
<td class='text-left'><div id='storyIdBox'><?php echo html::select('story', $stories, $case->story, 'class=form-control');?></div>
<td class='text-left'><div id='storyIdBox'><?php echo html::select('story', $stories, $case->story, 'class=form-control chosen');?></div>
</td>
</tr>
<tr>
module/testcase/view/showimport.html.php
+3 -3
View File
@@ -45,13 +45,13 @@
?>
</td>
<td><?php echo html::input("title[$key]", $case->title, "class='form-control' style='margin-top:2px'")?></td>
<td><?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='form-control'")?></td>
<td><?php echo html::select("story[$key]", $stories, isset($case->story) ? $case->story : (!empty($case->id) ? $cases[$case->id]->story : ''), "class='form-control'")?></td>
<td class='text-left'><?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='form-control'")?></td>
<td class='text-left'><?php echo html::select("story[$key]", $stories, isset($case->story) ? $case->story : (!empty($case->id) ? $cases[$case->id]->story : ''), "class='form-control'")?></td>
<td><?php echo html::select("pri[$key]", $lang->testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''), "class='form-control'")?></td>
<td><?php echo html::select("type[$key]", $lang->testcase->typeList, $case->type, "class='form-control'")?></td>
<td><?php echo html::select("status[$key]", $lang->testcase->statusList, isset($case->status) ? $case->status : '', "class='form-control'")?></td>
<td><?php echo html::input("frequency[$key]", isset($case->frequency) ? $case->frequency : 1, "class='form-control'")?></td>
<td><?php echo html::select("stage[$key][]", $lang->testcase->stageList, isset($case->stage) ? $case->stage : '', "multiple='multiple' class='form-control' style='height:auto'")?></td>
<td><?php echo html::select("stage[$key][]", $lang->testcase->stageList, isset($case->stage) ? $case->stage : '', "multiple='multiple' class='form-control chosen'")?></td>
<td><?php echo html::textarea("precondition[$key]", isset($case->precondition) ? $case->precondition : "", "class='form-control'")?></td>
<td>
<?php if(isset($stepData[$key]['desc'])):?>
module/todo/js/common.js
+1 -1
View File
@@ -49,7 +49,7 @@ function loadList(type, id)
if(type == 'bug' || type == 'task')
{
$(divClass).load(link);
$(divClass).load(link, function(){$(divClass).find('select').chosen(defaultChosenOptions)});
}
else if(type == 'custom')
{
module/todo/view/batchcreate.html.php
+4 -4
View File
@@ -28,11 +28,11 @@
<thead>
<tr>
<th class='w-30px'><?php echo $lang->idAB;?></th>
<th class='w-100px'><?php echo $lang->todo->type;?></th>
<th class='w-120px'><?php echo $lang->todo->type;?></th>
<th class='w-80px'><?php echo $lang->todo->pri;?></th>
<th class='w-p40 red'><?php echo $lang->todo->name;?></th>
<th class='w-p30 red'><?php echo $lang->todo->name;?></th>
<th><?php echo $lang->todo->desc;?></th>
<th class='w-300ox'><?php echo $lang->todo->beginAndEnd;?></th>
<th class='w-300px'><?php echo $lang->todo->beginAndEnd;?></th>
</tr>
</thead>
<?php $pri = 3;?>
@@ -41,7 +41,7 @@
<td><?php echo $i+1;?></td>
<td><?php echo html::select("types[$i]", $lang->todo->typeList, '', "onchange='loadList(this.value, " . ($i + 1) . ")' class='form-control'");?></td>
<td><?php echo html::select("pris[$i]", $lang->todo->priList, $pri, 'class=form-control');?></td>
<td>
<td class='text-left'>
<div id='<?php echo "nameBox" . ($i+1);?>' class='hidden'><?php echo html::input("names[$i]", '', 'class="text-left form-control"');?></div>
<div class='<?php echo "nameBox" . ($i+1);?>'><?php echo html::input("names[$i]", '', 'class="text-left form-control"');?></div>
</td>
module/todo/view/batchedit.html.php
+8 -8
View File
@@ -25,10 +25,10 @@
<tr>
<th class='w-40px'> <?php echo $lang->idAB;?></th>
<th class='w-100px'> <?php echo $lang->todo->date;?></th>
<th class='w-90px'> <?php echo $lang->todo->type;?></th>
<th class='w-120px'> <?php echo $lang->todo->type;?></th>
<th class='w-80px'> <?php echo $lang->todo->pri;?></th>
<th class='w-p65 red'><?php echo $lang->todo->name;?></th>
<th class='w-140px'> <?php echo $lang->todo->beginAndEnd;?></th>
<th class='red'><?php echo $lang->todo->name;?></th>
<th class='w-180px'> <?php echo $lang->todo->beginAndEnd;?></th>
<th class='w-100px'> <?php echo $lang->todo->status;?></th>
</tr>
</thead>
@@ -38,21 +38,21 @@
<td><?php echo html::input("dates[$todo->id]", $todo->date, "class='form-control form-date'");?></td>
<td><?php echo html::select("types[$todo->id]", $lang->todo->typeList, $todo->type, "onchange=loadList(this.value,$todo->id) class='form-control'");?></td>
<td><?php echo html::select("pris[$todo->id]", $lang->todo->priList, $todo->pri, 'class=form-control');?></td>
<td>
<td style='overflow:visible'>
<div id='<?php echo "nameBox" . $todo->id;?>' class='hidden'><? echo html::input("names[$todo->id]", '', "class='text-left form-control hiddenwin'"); ?></div>
<div class='<?php echo "nameBox" . $todo->id;?>'>
<div class='<?php echo "nameBox" . $todo->id;?> text-left'>
<?php
if($todo->type == 'custom')
{
echo html::input("names[$todo->id]", $todo->name, "class='text-left form-control'"); ;
echo html::input("names[$todo->id]", $todo->name, "class='form-control'"); ;
}
elseif($todo->type == 'task')
{
echo html::select("tasks[$todo->id]", $tasks, $todo->idvalue, 'class="form-control text-left"');
echo html::select("tasks[$todo->id]", $tasks, $todo->idvalue, 'class="form-control chosen"');
}
elseif($todo->type == 'bug')
{
echo html::select("bugs[$todo->id]", $bugs, $todo->idvalue, 'class="form-control text-left"');
echo html::select("bugs[$todo->id]", $bugs, $todo->idvalue, 'class="form-control chosen"');
}
?>
</div>
module/tree/js/browse.js
+1
View File
@@ -37,6 +37,7 @@ function syncProductOrProject(obj, type)
{
$('#' + type + 'Module').append('<option value=' + key + '>' + value + '</option')
});
$('#' + type + 'Module').trigger("chosen:updated");
})
$('#copyModule').attr('onclick', null);
$('#copyModule').bind('click', function(){syncModule(obj.value, viewType)});
module/tree/js/browsetask.js
-40
View File
@@ -1,40 +0,0 @@
function syncModule(rootID, type)
{
moduleID = type == 'task' ? $('#projectModule').val() : $('#productModule').val();
type = type == 'task' ? 'task' : 'story';
link = createLink('tree', 'ajaxGetSonModules', 'moduleID=' + moduleID + '&rootID=' + rootID + '&type=' + type);
$.getJSON(link, function(modules)
{
$('.helplink').addClass('hidden');
$.each(modules, function(key, value)
{
moduleName = value;
$('.text-3').each(function()
{
if(this.value == moduleName) modules[key] = null;
if(!this.value) $(this).parent().remove();
})
});
$.each(modules, function(key, value)
{
if(value) $('#sonModule').append("<span><input type='text' name=modules[] value=" + value + " style=margin-bottom:5px class=text-3 /><br /><span>");
})
})
}
function syncProject(obj)
{
link = createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + obj.value + "&viewType=task&rootModuleID=0&returnType=json");
$.getJSON(link, function(modules)
{
$('.helplink').addClass('hidden');
$('#' + type + 'Module').empty();
$.each(modules, function(key, value)
{
$('#' + type + 'Module').append('<option value=' + key + '>' + value + '</option')
});
})
$('#copyModule').attr('onclick', null);
$('#copyModule').bind('click', function(){syncModule(obj.value, 'task')});
}
module/tree/view/browse.html.php
+3 -14
View File
@@ -57,24 +57,13 @@
</td>
<td id='moduleBox'>
<?php
if($viewType == 'task')
{
if($allProject)
{
echo "<table class='copy w-p100'><tr>";
echo "<td class='w-260px'>" . html::select('allProject', $allProject, '', "class='form-control' onchange=\"syncProductOrProject(this,'project')\"") . '</td>';
echo "<td class='w-200px'>" . html::select('projectModule', $projectModules, '', "class='form-control'") . '</td>';
echo "<td class=''>" . html::commonButton($lang->tree->syncFromProject, "id='copyModule' onclick='syncModule($currentProject, \"task\")'") . '</td>';
echo '</tr></table>';
}
}
else if($viewType == 'story')
if($viewType == 'story')
{
if($allProduct)
{
echo "<table class='copy w-p100'><tr>";
echo "<td class='w-260px'>" . html::select('allProduct', $allProduct, '', "class='form-control' onchange=\"syncProductOrProject(this,'product')\"") . '</td>';
echo "<td class='w-200px'>" . html::select('productModule', $productModules, '', "class='form-control'") . '</td>';
echo "<td class='w-260px'>" . html::select('allProduct', $allProduct, '', "class='form-control chosen' onchange=\"syncProductOrProject(this,'product')\"") . '</td>';
echo "<td class='w-200px'>" . html::select('productModule', $productModules, '', "class='form-control chosen'") . '</td>';
echo "<td class=''>" . html::commonButton($lang->tree->syncFromProduct, "id='copyModule' onclick='syncModule($currentProduct, \"story\")'") . '</td>';
echo '</tr></table>';
}
module/upgrade/view/selectversion.html.php
+2 -1
View File
@@ -10,6 +10,7 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<?php include '../../common/view/chosen.html.php';?>
<div class='container'>
<form class='form-condensed' method='post' action='<?php echo inlink('confirm');?>'>
<div class='modal-dialog'>
@@ -20,7 +21,7 @@
<table class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->upgrade->fromVersion;?></th>
<td><?php echo html::select('fromVersion', $lang->upgrade->fromVersions, $version, "class='form-control'");?></td>
<td><?php echo html::select('fromVersion', $lang->upgrade->fromVersions, $version, "class='form-control chosen'");?></td>
<td class='text-danger'><?php echo $lang->upgrade->noteVersion;?></td>
</tr>
<tr>
module/user/js/batchcreate.js
+8 -1
View File
@@ -27,7 +27,14 @@ $(document).on('click', '.chosen-with-drop', function()
if($(select).val() == 'ditto')
{
var index = $(select).parents('td').index();
var value = $(select).parents('tr').prev('tr').find('td').eq(index).find('select').val();
var row = $(select).parents('tr').index();
var table = $(select).parents('tr').parent();
var value = '';
for(i = row - 1; i >= 0; i--)
{
value = $(table).find('tr').eq(i).find('td').eq(index).find('select').val();
if(value != 'ditto') break;
}
$(select).val(value);
$(select).trigger("chosen:updated");
}
module/user/js/batchedit.js
+16 -2
View File
@@ -4,7 +4,14 @@ $(document).on('click', '.chosen-with-drop', function()
if($(select).val() == 'ditto')
{
var index = $(select).parents('td').index();
var value = $(select).parents('tr').prev('tr').find('td').eq(index).find('select').val();
var row = $(select).parents('tr').index();
var table = $(select).parents('tr').parent();
var value = '';
for(i = row - 1; i >= 0; i--)
{
value = $(table).find('tr').eq(i).find('td').eq(index).find('select').val();
if(value != 'ditto') break;
}
$(select).val(value);
$(select).trigger("chosen:updated");
}
@@ -14,7 +21,14 @@ $(document).on('mousedown', 'select', function()
if($(this).val() == 'ditto')
{
var index = $(this).parents('td').index();
var value = $(this).parents('tr').prev('tr').find('td').eq(index).find('select').val();
var row = $(this).parents('tr').index();
var table = $(this).parents('tr').parent();
var value = '';
for(i = row - 1; i >= 0; i--)
{
value = $(table).find('tr').eq(i).find('td').eq(index).find('select').val();
if(value != 'ditto') break;
}
$(this).val(value);
}
})
module/user/view/batchcreate.html.php
+3 -3
View File
@@ -21,7 +21,7 @@
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-40px'><?php echo $lang->idAB;?></th>
@@ -41,11 +41,11 @@
<?php for($i = 0; $i < $config->user->batchCreate; $i++):?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td class='text-left'><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control chosen'");?></td>
<td><?php echo html::input("account[$i]", '', "class='form-control account_$i' autocomplete='off' onchange='changeEmail($i)'");?></td>
<td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>
<td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?></td>
<td class='text-left'><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='form-control chosen'");?></td>
<td><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)'");?></td>
<td><?php echo html::radio("gender[$i]", (array)$lang->user->genderList, 'm');?></td>
<td align='left'>
module/user/view/batchedit.html.php
+2 -2
View File
@@ -21,7 +21,7 @@
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-30px'><?php echo $lang->idAB;?></th>
@@ -45,7 +45,7 @@
?>
<tr class='text-center'>
<td><?php echo $user->id;?></td>
<td class='text-left'><?php echo html::select("dept[$user->id]", $depts, $dept, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("dept[$user->id]", $depts, $dept, "class='form-control chosen'");?></td>
<td><?php echo html::input("account[$user->id]", $user->account, "class='form-control' autocomplete='off'");?></td>
<td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control'");?></td>
<td><?php echo html::select("role[$user->id]", $lang->user->roleList, $role, "class='form-control'");?></td>