Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#41559.

Browse Source
This commit is contained in:
qiyu-xie
2021-08-18 16:36:38 +08:00
parent 4732bd9501
commit a760652e04
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -2287,7 +2287,7 @@ class execution extends control
$currentMembers = $this->execution->getTeamMembers($executionID);
$members2Import = $this->execution->getMembers2Import($team2Import, array_keys($currentMembers));
$teams2Import = $this->loadModel('personnel')->getCopyObjects($executionID, 'sprint');
$teams2Import = $this->loadModel('personnel')->getCopiedObjects($executionID, 'sprint');
$teams2Import = array('' => '') + $teams2Import;
/* Append users for get users. */
module/personnel/control.php
+1 -1
View File
@@ -202,7 +202,7 @@ class personnel extends control
$this->view->objectID = $objectID;
$this->view->objectType = $objectType;
$this->view->objectName = $objectName;
$this->view->objects = array('' => '') + $this->personnel->getCopyObjects($objectID, $objectType);
$this->view->objects = array('' => '') + $this->personnel->getCopiedObjects($objectID, $objectType);
$this->view->module = $module;
$this->view->deptID = $deptID;
$this->view->appendUsers = $appendUsers;
module/personnel/model.php
+2 -2
View File
@@ -457,14 +457,14 @@ class personnelModel extends model
}
/**
* Get objects to copy whitelist.
* Get objects to copy.
*
* @param int $objectID
* @param int $objectType
* @access public
* @return array
*/
public function getCopyObjects($objectID, $objectType)
public function getCopiedObjects($objectID, $objectType)
{
$objects = array();
module/project/control.php
+1 -1
View File
@@ -1257,7 +1257,7 @@ class project extends control
$this->view->depts = array('' => '') + $this->dept->getOptionMenu();
$this->view->currentMembers = $currentMembers;
$this->view->members2Import = $members2Import;
$this->view->teams2Import = array('' => '') + $this->loadModel('personnel')->getCopyObjects($projectID, 'project');
$this->view->teams2Import = array('' => '') + $this->loadModel('personnel')->getCopiedObjects($projectID, 'project');
$this->view->copyProjectID = $copyProjectID;
$this->display();
}