diff --git a/module/execution/config.php b/module/execution/config.php index 8c7d5a063a..7a5357c616 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -215,10 +215,3 @@ $config->execution->actionList['delete']['class'] = 'ajax-submit'; $config->execution->actionList['delete']['text'] = $lang->execution->delete; $config->execution->actionList['delete']['hint'] = $lang->execution->delete; $config->execution->actionList['delete']['url'] = helper::createLink('execution', 'delete',"executionID={rawID}"); - -$config->execution->team = new stdclass(); -$config->execution->team->actionList['unlink']['icon'] = 'unlink'; -$config->execution->team->actionList['unlink']['hint'] = $lang->execution->unlinkMember; -$config->execution->team->actionList['unlink']['url'] = 'javascript:deleteMember("{root}", "{userID}")'; - -include 'config/dtable.php'; diff --git a/module/execution/config/dtable.php b/module/execution/config/dtable.php index 6fb1cd8e9f..0f49927ed1 100644 --- a/module/execution/config/dtable.php +++ b/module/execution/config/dtable.php @@ -1,6 +1,6 @@ execution->dtable = new stdclass(); +$config->execution->team = new stdclass(); $config->execution->team->dtable = new stdclass(); $config->execution->dtable->fieldList['rawID']['title'] = $lang->idAB; @@ -134,6 +134,10 @@ $config->execution->dtable->fieldList['burn']['width'] = '88'; $config->execution->dtable->fieldList['burn']['group'] = '4'; $config->execution->dtable->fieldList['burn']['show'] = true; +$config->execution->team->actionList['unlink']['icon'] = 'unlink'; +$config->execution->team->actionList['unlink']['hint'] = $lang->execution->unlinkMember; +$config->execution->team->actionList['unlink']['url'] = 'javascript:deleteMember("{root}", "{userID}")'; + $config->execution->team->dtable->fieldList['account']['title'] = $lang->team->account; $config->execution->team->dtable->fieldList['account']['name'] = 'realname'; $config->execution->team->dtable->fieldList['account']['type'] = 'user'; diff --git a/module/execution/control.php b/module/execution/control.php index cf93823b89..fa9863e6c8 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1514,8 +1514,6 @@ class execution extends control */ public function team($executionID = 0) { - $this->app->session->set('teamList', $this->app->getURI(true), 'execution'); - $execution = $this->commonAction($executionID); $deptID = $this->app->user->admin ? 0 : $this->app->user->dept;