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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
wangyidong
2021-05-20 16:56:04 +08:00
parent 1cae502aee 6dd99adfad
commit e56f9d04bb
27 changed files with 159 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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. */