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

* Fix bug #12737.

Browse Source
This commit is contained in:
holan20180123
2021-05-20 11:14:45 +08:00
parent 43dc4b74f4
commit 69fa5c6b6c
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+7 -7
View File
@@ -220,8 +220,9 @@ class actionModel extends model
if($objectType == 'release') $record->project = $this->dao->select('project')->from(TABLE_BUILD)->where('id')->eq($record->build)->fetch('project');
if($objectType == 'team')
{
$team = $this->dao->select('type,root')->from(TABLE_TEAM)->where('id')->eq($objectID)->fetch();
$record->{$team->type} = $team->root;
$team = $this->dao->select('type')->from(TABLE_PROJECT)->where('id')->eq($objectID)->fetch();
$type = $team->type == 'project' ? 'project' : 'execution';
$record->$type = $objectID;
}
if($objectType == 'task')
{
@@ -944,16 +945,15 @@ class actionModel extends model
}
elseif($objectType == 'team')
{
$objectInfo = $this->dao->select('t1.id as projectID,t2.id,t1.team as name,t1.type')->from(TABLE_PROJECT)->alias('t1')
->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
->where('t2.id')->in($objectIds)
$objectInfo = $this->dao->select('id,team,type')->from(TABLE_PROJECT)
->where('id')->in($objectIds)
->fetchAll();
$objectProject = array();
foreach($objectInfo as $object)
{
$objectName[$object->id] = $object->name;
if($object->type == 'project') $objectProject[$object->id] = $object->projectID;
$objectName[$object->id] = $object->team;
if($object->type == 'project') $objectProject[$object->id] = $object->id;
}
}
else
module/execution/control.php
+2 -4
View File
@@ -2188,8 +2188,7 @@ class execution extends control
if(!empty($_POST))
{
$this->execution->manageMembers($executionID);
$teamID = $this->dao->select('id')->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq('execution')->fetch('id');
$this->loadModel('action')->create('team', $teamID, 'managedTeam');
$this->loadModel('action')->create('team', $executionID, 'managedTeam');
die(js::locate($this->createLink('execution', 'team', "executionID=$executionID"), 'parent'));
}
@@ -2258,8 +2257,7 @@ class execution extends control
$this->execution->unlinkMember($executionID, $account);
if(!dao::isError())
{
$teamID = $this->dao->select('id')->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq('execution')->fetch('id');
$this->loadModel('action')->create('team', $teamID, 'managedTeam');
$this->loadModel('action')->create('team', $executionID, 'managedTeam');
}
/* if ajax request, send result. */
module/project/control.php
+1 -2
View File
@@ -1094,8 +1094,7 @@ class project extends control
if(!empty($_POST))
{
$this->project->manageMembers($projectID);
$teamID = $this->dao->select('id')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq('project')->fetch('id');
$this->loadModel('action')->create('team', $teamID, 'ManagedTeam');
$this->loadModel('action')->create('team', $projectID, 'ManagedTeam');
$link = $this->createLink('project', 'manageMembers', "projectID=$projectID");
$this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', 'locate' => $link));