From a1726bc6d7d0fdde1377977ed4651ac1ef9d61d7 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Tue, 19 Dec 2023 00:19:18 +0100 Subject: [PATCH] Shorten code Signed-off-by: Kamil Tekiela --- .../Database/DesignerController.php | 2 - src/Database/Designer.php | 48 ++++--------------- 2 files changed, 10 insertions(+), 40 deletions(-) diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php index 639420304e..541430f35c 100644 --- a/src/Controllers/Database/DesignerController.php +++ b/src/Controllers/Database/DesignerController.php @@ -64,7 +64,6 @@ class DesignerController extends AbstractController $scriptDisplayField = $this->designerCommon->getTablesInfo($db, $table); $tableColumn = $this->designerCommon->getColumnsInfo($scriptDisplayField); $tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField); - $columnsType = $this->databaseDesigner->getColumnTypes($tableColumn, $tablesAllKeys); $html = $this->template->render('database/designer/database_tables', [ @@ -217,7 +216,6 @@ class DesignerController extends AbstractController $scriptTables = $this->designerCommon->getScriptTabs($scriptDisplayField); $tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField); $classesSideMenu = $this->databaseDesigner->returnClassNamesFromMenuButtons(); - $scriptContr = $this->designerCommon->getScriptContr($scriptDisplayField); $this->response->setMinimalFooter(); diff --git a/src/Database/Designer.php b/src/Database/Designer.php index a5d2bd19ff..0caf3cbd3a 100644 --- a/src/Database/Designer.php +++ b/src/Database/Designer.php @@ -166,46 +166,18 @@ class Designer */ public function returnClassNamesFromMenuButtons(): array { - $classesArray = []; $paramsArray = $this->getSideMenuParamsArray(); + $selectedButton = 'M_butt_Selected_down'; + $normalButton = 'M_butt'; - if (isset($paramsArray['angular_direct']) && $paramsArray['angular_direct'] === 'angular') { - $classesArray['angular_direct'] = 'M_butt_Selected_down'; - } else { - $classesArray['angular_direct'] = 'M_butt'; - } - - if (isset($paramsArray['snap_to_grid']) && $paramsArray['snap_to_grid'] === 'on') { - $classesArray['snap_to_grid'] = 'M_butt_Selected_down'; - } else { - $classesArray['snap_to_grid'] = 'M_butt'; - } - - if (isset($paramsArray['pin_text']) && $paramsArray['pin_text'] === 'true') { - $classesArray['pin_text'] = 'M_butt_Selected_down'; - } else { - $classesArray['pin_text'] = 'M_butt'; - } - - if (isset($paramsArray['relation_lines']) && $paramsArray['relation_lines'] === 'false') { - $classesArray['relation_lines'] = 'M_butt_Selected_down'; - } else { - $classesArray['relation_lines'] = 'M_butt'; - } - - if (isset($paramsArray['small_big_all']) && $paramsArray['small_big_all'] === 'v') { - $classesArray['small_big_all'] = 'M_butt_Selected_down'; - } else { - $classesArray['small_big_all'] = 'M_butt'; - } - - if (isset($paramsArray['side_menu']) && $paramsArray['side_menu'] === 'true') { - $classesArray['side_menu'] = 'M_butt_Selected_down'; - } else { - $classesArray['side_menu'] = 'M_butt'; - } - - return $classesArray; + return [ + 'angular_direct' => ($paramsArray['angular_direct'] ?? '') === 'angular' ? $selectedButton : $normalButton, + 'snap_to_grid' => ($paramsArray['snap_to_grid'] ?? '') === 'on' ? $selectedButton : $normalButton, + 'pin_text' => ($paramsArray['pin_text'] ?? '') === 'true' ? $selectedButton : $normalButton, + 'relation_lines' => ($paramsArray['relation_lines'] ?? '') === 'false' ? $selectedButton : $normalButton, + 'small_big_all' => ($paramsArray['small_big_all'] ?? '') === 'v' ? $selectedButton : $normalButton, + 'side_menu' => ($paramsArray['side_menu'] ?? '') === 'true' ? $selectedButton : $normalButton, + ]; } /**