diff --git a/module/datatable/control.php b/module/datatable/control.php index 6b26426d4e..2e49ab984e 100644 --- a/module/datatable/control.php +++ b/module/datatable/control.php @@ -25,9 +25,9 @@ class datatable extends control */ public function ajaxDisplay(string $datatableID, string $moduleName, string $methodName, string $currentModule, string $currentMethod) { - $this->app->loadLang($currentModule); - $this->app->loadConfig($currentModule); + $this->loadModel($currentModule); + if($moduleName == 'execution' && $methodName == 'task' && $this->config->vision != 'lite') $this->view->execution = $this->execution->getByID($this->session->execution); $this->view->datatableID = $datatableID; $this->view->moduleName = $moduleName; $this->view->methodName = $methodName; diff --git a/module/datatable/ui/ajaxdisplay.html.php b/module/datatable/ui/ajaxdisplay.html.php index cb10262e3d..08ab2f58bb 100644 --- a/module/datatable/ui/ajaxdisplay.html.php +++ b/module/datatable/ui/ajaxdisplay.html.php @@ -45,7 +45,7 @@ form set::value($showModule) ) ), - $moduleName == 'execution' && $methodName == 'task' && $this->config->vision != 'lite' ? formGroup + !empty($execution->multiple) ? formGroup ( set::label($lang->datatable->showAllModule), radiolist diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index 88a822e0ce..2b5cfe1ddc 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -113,7 +113,6 @@ sidebar set::settingLink(createLink('tree', 'browsetask', "rootID=$execution->id&productID=0")), set::settingApp($execution->multiple ? 'execution' : 'project'), set::closeLink(createLink('execution', 'task')), - set::showDisplay($execution->multiple), set::app($app->tab) ) );