diff --git a/module/project/control.php b/module/project/control.php index d0c2a9e59a..dd71f43ed1 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -1093,7 +1093,7 @@ class project extends control $users = $this->user->getPairs('noclosed|nodeleted|devfirst'); $roles = $this->user->getUserRoles(array_keys($users)); - $deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept); + $deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs((int)$dept); $currentMembers = $this->project->getTeamMembers($projectID); $members2Import = $this->project->getMembers2Import($copyProjectID, array_keys($currentMembers)); diff --git a/module/project/js/managemembers.ui.js b/module/project/js/managemembers.ui.js index 78b96f42af..fef793c74e 100644 --- a/module/project/js/managemembers.ui.js +++ b/module/project/js/managemembers.ui.js @@ -54,9 +54,9 @@ window.deleteItem = function(obj) * @access public * @return void */ -window.setDeptUsers = function() +window.setDeptUsers = function(e) { - const dept = $(this).val(); // Get dept ID. + const dept = $(e.target).val(); // Get dept ID. const link = $.createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=' + dept + '©ProjectID=' + copyProjectID); // Create manageMembers link. loadPage(link); } @@ -68,10 +68,10 @@ window.setDeptUsers = function() * @access public * @return void */ -function choseTeam2Copy() +function choseTeam2Copy(e) { - const copyProjectID = $(this).val(); - const dept = $('#dept').val(); + const copyProjectID = $(e.target).val(); + const dept = $('input[name=dept]').val(); const link = $.createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=' + dept + '©ProjectID=' + copyProjectID); loadPage(link); } diff --git a/module/project/ui/managemembers.html.php b/module/project/ui/managemembers.html.php index 24173bad3a..eaf37d7997 100644 --- a/module/project/ui/managemembers.html.php +++ b/module/project/ui/managemembers.html.php @@ -35,6 +35,7 @@ if(count($teams2Import) > 1) set::value($copyProjectID), set::items($teams2Import), set('data-placeholder', $lang->project->copyTeamTitle), + set::width('200px'), on::change('choseTeam2Copy') ) ); @@ -59,6 +60,7 @@ featureBar set::value($dept), set::items($depts), set('data-placeholder', $lang->execution->selectDeptTitle), + set::width('200px'), on::change('setDeptUsers') ), $copyTeamBox