Tidy

* Use namespaces for classes. * Improve the function conditionality for the page action.
Jack-Dane · Dec 5, 2023 · 9469f33 · 9469f33
1 parent 154dba4
commit 9469f33
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 3 deletions.
diff --git a/admin/menu_items.php b/admin/menu_items.php
@@ -1,6 +1,6 @@
 <?php
 
-include("pageHelpers/table_display.php");
+include("table_display.php");
 include("pages/page_router.php");
 include("pages/forms/odoo_form.php");
 include("pages/connections/odoo_connection.php");

diff --git a/admin/pages/connections/odoo_connection.php b/admin/pages/connections/odoo_connection.php
@@ -9,6 +9,9 @@
 use odoo_conn\admin\api\endpoints\OdooConnPutOdooConnection;
 use odoo_conn\encryption\OdooConnEncryptionFileHandler;
 use odoo_conn\encryption\OdooConnEncryptionHandler;
+use odoo_conn\admin\pages\page_router\OdooConnPageRouterCreate;
+use odoo_conn\admin\table_display\OdooConnCustomTableEditableDisplay;
+
 use function odoo_conn\admin\api\endpoints\odoo_conn_test_odoo_connection;
 
 

diff --git a/admin/pages/errors/odoo_errors.php b/admin/pages/errors/odoo_errors.php
@@ -4,6 +4,8 @@
 
 use odoo_conn\admin\api\endpoints\OdooConnGetOdooErrors;
 use odoo_conn\admin\api\endpoints\OdooConnDeleteOdooErrors;
+use odoo_conn\admin\pages\page_router\OdooConnPageRouter;
+use odoo_conn\admin\table_display\OdooConnCustomTableDeletableDisplay;
 
 
 class OdooConnOdooErrorsListTableEditable extends OdooConnCustomTableDeletableDisplay

diff --git a/admin/pages/form_mappings/odoo_form_mapping.php b/admin/pages/form_mappings/odoo_form_mapping.php
@@ -7,6 +7,8 @@
 use odoo_conn\admin\api\endpoints\OdooConnPostOdooFormMappings;
 use odoo_conn\admin\api\endpoints\OdooConnGetOdooFormMappingSingle;
 use odoo_conn\admin\api\endpoints\OdooConnPutOdooFormMappings;
+use odoo_conn\admin\pages\page_router\OdooConnPageRouterCreate;
+use odoo_conn\admin\table_display\OdooConnCustomTableEditableDisplay;
 
 
 class OdooConnOdooFormMappingListTableEditable extends OdooConnCustomTableEditableDisplay

diff --git a/admin/pages/forms/odoo_form.php b/admin/pages/forms/odoo_form.php
@@ -7,6 +7,8 @@
 use odoo_conn\admin\api\endpoints\OdooConnPostOdooForm;
 use odoo_conn\admin\api\endpoints\OdooConnGetOdooFormSingle;
 use odoo_conn\admin\api\endpoints\OdooConnPutOdooForm;
+use odoo_conn\admin\pages\page_router\OdooConnPageRouterCreate;
+use odoo_conn\admin\table_display\OdooConnCustomTableEditableDisplay;
 
 
 class OdooConnOdooFormListTableEditable extends OdooConnCustomTableEditableDisplay

diff --git a/admin/pages/page_router.php b/admin/pages/page_router.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace odoo_conn\admin\pages\page_router;
+
+
 abstract class OdooConnPageRouter
 {
 
@@ -66,14 +69,14 @@ protected function dont_display_table_actions()
 
     protected function handle_route($action)
     {
-        parent::handle_route($action);
-
         if ($action === "new") {
             $this->add_form_style();
             $this->display_input_form();
         } else if ($action === "edit") {
             $this->add_form_style();
             $this->display_edit_form($_REQUEST["id"]);
+        } else {
+            parent::handle_route($action);
         }
     }
 

diff --git a/admin/pageHelpers/table_display.php → admin/table_display.php b/admin/pageHelpers/table_display.php → admin/table_display.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace odoo_conn\admin\table_display;
+
+
+use WP_List_Table;
+
 
 if (!class_exists('WP_List_Table')) {
     require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');