diff --git a/module/project/control.php b/module/project/control.php index 0c494ab8c6..4c0b318805 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -1210,7 +1210,6 @@ class project extends control $execution = $this->execution->getByID($executionID); if($executionID) $this->execution->manageMembers($execution, $members); } - return $this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', 'load' => $this->createLink('project', 'team', "projectID=$projectID"))); } diff --git a/module/project/js/managemembers.ui.js b/module/project/js/managemembers.ui.js index df302ed031..186b91692b 100644 --- a/module/project/js/managemembers.ui.js +++ b/module/project/js/managemembers.ui.js @@ -87,7 +87,7 @@ window.setDeptUsers = function(e) { const dept = $(e.target).val(); // Get dept ID. const link = $.createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=' + dept + '©ProjectID=' + copyProjectID); // Create manageMembers link. - loadPage(link); + isInModal ? loadModal(link) : loadPage(link); } /** @@ -102,7 +102,7 @@ function choseTeam2Copy(e) const copyProjectID = $(e.target).val(); const dept = $('input[name=dept]').val(); const link = $.createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=' + dept + '©ProjectID=' + copyProjectID); - loadPage(link); + isInModal ? loadModal(link) : loadPage(link); } window.changeProjectMembers = function() @@ -126,7 +126,8 @@ window.changeProjectMembers = function() if(!isDeleted) { const formData = new FormData($("#teamForm")[0]); - $.ajaxSubmit({url: $('#teamForm').attr('action'), data: formData}); + const options = isInModal ? {url: $('#teamForm').attr('action'), data: formData, callback: `renderTaskAssignedTo(${projectID})`, 'load': false, 'closeModal': true} : {url: $('#teamForm').attr('action'), data: formData}; + $.ajaxSubmit(options); } else { @@ -136,7 +137,8 @@ window.changeProjectMembers = function() { $('#removeExecution').val('yes'); const formData = new FormData($("#teamForm")[0]); - $.ajaxSubmit({url: $('#teamForm').attr('action'), data: formData}); + const options = isInModal ? {url: $('#teamForm').attr('action'), data: formData, callback: `renderTaskAssignedTo(${projectID})`, 'load': false, 'closeModal': true} : {url: $('#teamForm').attr('action'), data: formData}; + $.ajaxSubmit(options); } }); } diff --git a/module/project/ui/managemembers.html.php b/module/project/ui/managemembers.html.php index d2ac07a02b..13d9feb375 100644 --- a/module/project/ui/managemembers.html.php +++ b/module/project/ui/managemembers.html.php @@ -17,6 +17,7 @@ jsVar('copyProjectID', $copyProjectID); jsVar('oldAccountList', array_keys($currentMembers)); jsVar('unlinkExecutionMembers', $lang->project->unlinkExecutionMembers); jsVar('executionMembers', array_values($executionMembers)); +jsVar('isInModal', isInModal()); /* zin: Define the set::module('team') feature bar on main menu. */ $copyTeamBox = ''; @@ -232,6 +233,7 @@ div ( setClass('main-form'), set::id('teamForm'), + commonModel::isTutorialMode() ? null : set::ajax(array('beforeSubmit' => jsRaw("changeProjectMembers"))), h::table ( set::className('table table-form'), @@ -282,16 +284,6 @@ div ) ) ), - set::actions(array( - array( - 'id' => 'saveButton', - 'text' => $lang->save, - 'type' => 'primary', - 'btnType' => 'button', - 'onclick' => commonModel::isTutorialMode() ? '' : 'changeProjectMembers()' - ), - 'cancel' - )) ) );