diff --git a/module/execution/control.php b/module/execution/control.php index 75192e9467..73e9e46f32 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -3041,6 +3041,7 @@ class execution extends control */ public function export(string $status, int $productID, string $orderBy, string $from) { + $status = strtolower($status); if($_POST) { $executionLang = $this->lang->execution; @@ -3067,10 +3068,10 @@ class execution extends control $users = $this->loadModel('user')->getPairs('noletter'); $showTask = ($this->app->tab == 'project' && (bool)$this->cookie->showTask); - if($showTask && strtolower($status) == 'bysearch') + if($showTask && $status == 'bysearch') { $executionIdList = $this->loadModel('programplan')->getStageList($projectID, $productID, 'all', 'order'); - $tasks = $this->programplan->getGanttTasks($projectID, array_keys($executionIdList), strtolower($status), 0, null); + $tasks = $this->programplan->getGanttTasks($projectID, array_keys($executionIdList), $status, 0, null); $executionTasks = array(); $executionIdList = array(); foreach($tasks as $task) @@ -3149,7 +3150,7 @@ class execution extends control $fileName = $project->name . ' - ' . $executionConcept; } - if($status != 'bysearch') $fileName = (in_array($status, array('all', 'undone', 'delayed')) ? $this->lang->execution->$status : $this->lang->execution->statusList[$status]) . $executionConcept; + if($status != 'bysearch') $fileName = (in_array($status, array('all', 'undone', 'delayed')) ? zget($this->lang->execution, $status, '') : zget($this->lang->execution->statusList, $status, '')) . $executionConcept; $this->view->fileName = !empty($fileName) ? $fileName : $executionConcept; $this->display(); }