* adjust for task #2359.
This commit is contained in:
@@ -1083,6 +1083,29 @@ class bug extends control
|
||||
die(html::select('assignedTo', $projectMembers, $selectedUser, 'class="form-control"'));
|
||||
}
|
||||
|
||||
/**
|
||||
* AJAX: get team members of the latest project of a product as assignedTo list.
|
||||
*
|
||||
* @param int $productID
|
||||
* @param string $selectedUser
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public function ajaxLoadProjectTeamMembers($productID, $selectedUser = '')
|
||||
{
|
||||
$latestProjectID = $this->product->getLatestProject($productID);
|
||||
if(!empty($latestProjectID))
|
||||
{
|
||||
$projectMembers = $this->loadModel('project')->getTeamMemberPairs($latestProjectID, 'nodeleted');
|
||||
}
|
||||
else
|
||||
{
|
||||
$projectMembers = $this->loadModel('user')->getPairs('nodeleted|devfirst|noclosed');
|
||||
}
|
||||
|
||||
die(html::select('assignedTo', $projectMembers, $selectedUser, 'class="form-control"'));
|
||||
}
|
||||
|
||||
/**
|
||||
* AJAX: get all users as assignedTo list.
|
||||
*
|
||||
@@ -1092,7 +1115,7 @@ class bug extends control
|
||||
*/
|
||||
public function ajaxLoadAllUsers($selectedUser = '')
|
||||
{
|
||||
$allUsers = $this->loadModel('user')->getPairs('nodeleted, devfirst');
|
||||
$allUsers = $this->loadModel('user')->getPairs('nodeleted|devfirst|noclosed');
|
||||
|
||||
die(html::select('assignedTo', $allUsers, $selectedUser, 'class="form-control"'));
|
||||
}
|
||||
|
||||
@@ -32,7 +32,11 @@ $(function()
|
||||
*/
|
||||
function loadAll(productID)
|
||||
{
|
||||
if(page == 'create') setAssignedTo();
|
||||
if(page == 'create')
|
||||
{
|
||||
setAssignedTo();
|
||||
loadProjectTeamMembers(productID);
|
||||
}
|
||||
|
||||
if(!changeProductConfirmed)
|
||||
{
|
||||
|
||||
@@ -23,6 +23,19 @@ function loadAllUsers()
|
||||
$('#assignedToBox').load(link, function(){$('#assignedTo').chosen(defaultChosenOptions);});
|
||||
}
|
||||
|
||||
/**
|
||||
* Load team members of the latest project of a product as assignedTo list.
|
||||
*
|
||||
* @param $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function loadProjectTeamMembers(productID)
|
||||
{
|
||||
link = createLink('bug', 'ajaxLoadProjectTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val());
|
||||
$('#assignedToBox').load(link, function(){$('#assignedTo').chosen(defaultChosenOptions);});
|
||||
}
|
||||
|
||||
/**
|
||||
* load assignedTo and stories of module.
|
||||
*
|
||||
|
||||
@@ -743,7 +743,7 @@ class productModel extends model
|
||||
*/
|
||||
public function getLatestProject($productID)
|
||||
{
|
||||
$projectList = array_keys($this->loadModel('project')->getPairs());
|
||||
$projectList = array_keys($this->loadModel('project')->getPairs('noclosed'));
|
||||
$projects = $this->dao->select('t2.id, t2.name, t2.begin')
|
||||
->from(TABLE_PROJECTPRODUCT)->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2')
|
||||
->on('t1.project = t2.id')
|
||||
|
||||
Reference in New Issue
Block a user