* finish task #5060.

This commit is contained in:
Catouse
2018-11-15 14:22:43 +08:00
parent 4cfcbd291e
commit aa5031778d
10 changed files with 193 additions and 53 deletions
+34 -6
View File
@@ -290,12 +290,20 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->product->branchName[$this->session->currentProductType];?> <span class="caret"></span></button>
<?php $withSearch = count($branches) > 8;?>
<?php if($withSearch):?>
<div class="dropdown-menu search-list" data-ride="searchList">
<div class="dropdown-menu search-list search-box-sink" data-ride="searchList">
<div class="input-control search-box has-icon-left has-icon-right search-example">
<input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
<label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php
$branchNames = array();
foreach($branches as $branchID => $branchName)
{
$branchNames[] = $branchName;
}
$branchsPinYin = common::convert2Pinyin($branchNames);
?>
<?php else:?>
<div class="dropdown-menu search-list">
<?php endif;?>
@@ -303,8 +311,9 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<?php
foreach($branches as $branchID => $branchName)
{
$searchKey = $withSearch ? ('data-key="' . zget($branchsPinYin, $branchName, '') . '"') : '';
$actionLink = $this->createLink('bug', 'batchChangeBranch', "branchID=$branchID");
echo html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\" data-key='$branchID'");
echo html::a('#', $branchName, '', "$searchKey onclick=\"setFormAction('$actionLink', 'hiddenwin')\" data-key='$branchID'");
}
?>
</div>
@@ -316,12 +325,20 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->bug->moduleAB;?> <span class="caret"></span></button>
<?php $withSearch = count($modules) > 8;?>
<?php if($withSearch):?>
<div class="dropdown-menu search-list" data-ride="searchList">
<div class="dropdown-menu search-list search-box-sink" data-ride="searchList">
<div class="input-control search-box has-icon-left has-icon-right search-example">
<input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
<label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php
$moduleNames = array();
foreach($modules as $moduleId => $module)
{
$moduleNames[] = $module;
}
$modulesPinYin = common::convert2Pinyin($moduleNames);
?>
<?php else:?>
<div class="dropdown-menu search-list">
<?php endif;?>
@@ -329,8 +346,9 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<?php
foreach($modules as $moduleId => $module)
{
$searchKey = $withSearch ? ('data-key="' . zget($modulesPinYin, $module, '') . '"') : '';
$actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId");
echo html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\" data-key='$moduleID'");
echo html::a('#', $module, '', "$searchKey onclick=\"setFormAction('$actionLink','hiddenwin')\" data-key='$moduleID'");
}
?>
</div>
@@ -342,12 +360,21 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->bug->assignedTo;?> <span class="caret"></span></button>
<?php $withSearch = count($memberPairs) > 10;?>
<?php if($withSearch):?>
<div class="dropdown-menu search-list" data-ride="searchList">
<div class="dropdown-menu search-list search-box-sink" data-ride="searchList">
<div class="input-control search-box has-icon-left has-icon-right search-example">
<input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
<label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php
$memberNames = array();
foreach($memberPairs as $memberId => $member)
{
if(empty($memberId)) continue;
$memberNames[] = $member;
}
$membersPinYin = common::convert2Pinyin($memberNames);
?>
<?php else:?>
<div class="dropdown-menu search-list">
<?php endif;?>
@@ -358,7 +385,8 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
foreach ($memberPairs as $key => $value)
{
if(empty($key)) continue;
echo html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\",\"hiddenwin\")", $value, '', "data-key='$key'");
$searchKey = $withSearch ? ('data-key="' . zget($membersPinYin, $value, '') . " @$key\"") : "data-key='@$key'";
echo html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\",\"hiddenwin\")", $value, '', $searchKey);
}
?>
</div>