* code for task #20556.

This commit is contained in:
王怡栋
2022-03-11 10:03:48 +08:00
parent 185ae2a4f8
commit 8053903ba2
6 changed files with 44 additions and 10 deletions

View File

@@ -203,7 +203,7 @@ class testcase extends control
$this->view->productID = $productID;
$this->view->product = $product;
$this->view->productName = $this->products[$productID];
$this->view->modules = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch);
$this->view->modules = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch == 'all' ? '0' : $branch);
$this->view->moduleTree = $moduleTree;
$this->view->moduleName = $moduleID ? $tree->name : $this->lang->tree->all;
$this->view->moduleID = $moduleID;

View File

@@ -1289,21 +1289,23 @@ class user extends control
/**
* Ajax get group by vision.
*
* @param array $visions rnd|lite
* @param int $i
* @param string $visions rnd|lite
* @param int $i
* @param string $selected
* @access public
* @return string
*/
public function ajaxGetGroup($visions, $i = 0)
public function ajaxGetGroup($visions, $i = 0, $selected = '')
{
$visions = explode(',', $visions);
$groupList = $this->user->getGroupsByVisions($visions);
if($i)
{
if($i > 1) $groupList = $groupList + array('ditto' => $this->lang->user->ditto);
return print(html::select("group[$i][]", $groupList, $i > 1 ? 'ditto' : '', 'size=3 multiple=multiple class="form-control chosen"'));
if(empty($selected)) $selected = $i > 1 ? 'ditto' : '';
return print(html::select("group[$i][]", $groupList, $selected, 'size=3 multiple=multiple class="form-control chosen"'));
}
return print(html::select('group[]', $groupList, '', 'size=3 multiple=multiple class="form-control chosen"'));
return print(html::select('group[]', $groupList, $selected, 'size=3 multiple=multiple class="form-control chosen"'));
}
/**

View File

@@ -87,7 +87,8 @@ $('select[id^="visions"]').each(function()
var i = $(this).attr('id').replace(/[^0-9]/ig, '');
var vision = $('#visions1 option:selected').val();
$.post(createLink('user', 'ajaxGetGroup', "visions=" + vision + '&i=' + i), function(data){
$.post(createLink('user', 'ajaxGetGroup', "visions=" + vision + '&i=' + i + '&selected=' + $('#group' + i).val()), function(data)
{
$('#group' + i).replaceWith(data);
$('#group' + i + '_chosen').remove();
$('#group' + i).chosen();
@@ -104,7 +105,8 @@ $("select[id^='visions']").change(function()
visions.push($(this).val());
});
$.post(createLink('user', 'ajaxGetGroup', "visions=" + visions + '&i=' + i), function(data){
$.post(createLink('user', 'ajaxGetGroup', "visions=" + visions + '&i=' + i + '&selected=' + $('#group' + i).val()), function(data)
{
$('#group' + i).replaceWith(data);
$('#group' + i + '_chosen').remove();
$('#group' + i).chosen();
@@ -116,7 +118,8 @@ $("select[id^='visions']").change(function()
((function(n)
{
$.post(createLink('user', 'ajaxGetGroup', "visions=" + visions + '&i=' + n), function(data){
$.post(createLink('user', 'ajaxGetGroup', "visions=" + visions + '&i=' + n + '&selected=' + $('#group' + i).val()), function(data)
{
$('#group' + n).replaceWith(data);
$('#group' + n + '_chosen').remove();
$('#group' + n).chosen();

View File

@@ -21,3 +21,16 @@ $(document).on('change', 'select', function()
$(this).trigger("change");
}
})
$('select[id^="visions"]').each(function()
{
var i = $(this).attr('id').replace(/[^0-9]/ig, '');
var vision = $('#visions1 option:selected').val();
$.post(createLink('user', 'ajaxGetGroup', "visions=" + vision + '&i=' + i + '&selected=' + $('#group' + i).val()), function(data)
{
$('#group' + i).replaceWith(data);
$('#group' + i + '_chosen').remove();
$('#group' + i).chosen();
})
})

View File

@@ -34,7 +34,7 @@ function changeVision()
visions.push($(this).val());
});
var link = createLink('user', 'ajaxGetGroup', 'visions=' + visions);
var link = createLink('user', 'ajaxGetGroup', 'visions=' + visions + '&i=0&selected=' + $('#group').val());
$.post(link, function(data)
{
$('#group').replaceWith(data);

View File

@@ -39,6 +39,7 @@ $(function()
})
changeType(type);
$('#visions').change();
});
/**
@@ -63,3 +64,18 @@ function changeType(type)
$('#dept, #commiter').closest('tr').addClass('hide');
}
}
var groups = $('#groups').val();
$(document).on('change', '#groups', function(){groups = $('#groups').val()});
$("#visions").change(function()
{
visions = $(this).val();
$.post(createLink('user', 'ajaxGetGroup', "visions=" + visions + '&i=' + 0 + '&selected=' + groups), function(data)
{
$('#groups').replaceWith(data);
$('#groups' + '_chosen').remove();
$('#group').attr('id', 'groups').attr('name', 'groups[]');
$('#groups').chosen();
});
});