From bbb9e3d40eaa47d37ff078c7e1e35cbed7965741 Mon Sep 17 00:00:00 2001 From: bellord13 Date: Wed, 6 Sep 2023 00:46:31 +0300 Subject: [PATCH] fix --- admin/main/submenu/item1/config.php | 30 ------------------- .../submenu/item1/include/documentation.php | 1 - admin/main/submenu/item1/index.php | 18 ----------- admin/main/submenu/item1/lang/ru/index.php | 2 -- admin/main/submenu/item1/menu.php | 11 ------- admin/main/submenu/null_table/index.php | 2 +- admin/main/submenu/null_table/menu.php | 1 + .../submenu/{null_table_row => row}/index.php | 0 .../lang/ru/config.php | 0 .../submenu/{null_table_row => row}/menu.php | 1 + default_config.php | 4 ++- 11 files changed, 6 insertions(+), 64 deletions(-) delete mode 100644 admin/main/submenu/item1/config.php delete mode 100644 admin/main/submenu/item1/include/documentation.php delete mode 100644 admin/main/submenu/item1/index.php delete mode 100644 admin/main/submenu/item1/lang/ru/index.php delete mode 100644 admin/main/submenu/item1/menu.php rename admin/main/submenu/null_table/submenu/{null_table_row => row}/index.php (100%) rename admin/main/submenu/null_table/submenu/{null_table_row => row}/lang/ru/config.php (100%) rename admin/main/submenu/null_table/submenu/{null_table_row => row}/menu.php (86%) diff --git a/admin/main/submenu/item1/config.php b/admin/main/submenu/item1/config.php deleted file mode 100644 index 329d2a9..0000000 --- a/admin/main/submenu/item1/config.php +++ /dev/null @@ -1,30 +0,0 @@ - array( - 'TITLE' => 'Общие сведения', - 'OPTIONS' => array( - - ), - ), - 'DOCS' => array( - 'TITLE' => 'Docs', - 'OPTIONS' => array( - 'DOCUMENTATION' => array( - 'TITLE' => 'Documentation', - 'TYPE' => 'content', - 'INCLUDEFILE' => \Wt\Core\Tools::removeDocRoot(__DIR__ . '/include/documentation.php'), - 'SHOW_EDIT_BUTTON' => 'Y', - 'DEFAULT' => '', - ), - ), - ), -); \ No newline at end of file diff --git a/admin/main/submenu/item1/include/documentation.php b/admin/main/submenu/item1/include/documentation.php deleted file mode 100644 index 45d092e..0000000 --- a/admin/main/submenu/item1/include/documentation.php +++ /dev/null @@ -1 +0,0 @@ -Документация \ No newline at end of file diff --git a/admin/main/submenu/item1/index.php b/admin/main/submenu/item1/index.php deleted file mode 100644 index 52fe0e0..0000000 --- a/admin/main/submenu/item1/index.php +++ /dev/null @@ -1,18 +0,0 @@ -render(); - -require($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/main/include/epilog_admin.php'); \ No newline at end of file diff --git a/admin/main/submenu/item1/lang/ru/index.php b/admin/main/submenu/item1/lang/ru/index.php deleted file mode 100644 index c090dcf..0000000 --- a/admin/main/submenu/item1/lang/ru/index.php +++ /dev/null @@ -1,2 +0,0 @@ -setSort(5) - ->setTitle('Null: Item1') - ->setUrl(); \ No newline at end of file diff --git a/admin/main/submenu/null_table/index.php b/admin/main/submenu/null_table/index.php index c42c369..73228a9 100644 --- a/admin/main/submenu/null_table/index.php +++ b/admin/main/submenu/null_table/index.php @@ -11,7 +11,7 @@ require_once($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/main/include/prolog_admi */ $ormTable = resolve(NullTable::class); -$tableAdminPage = new TableAdminPage($ormTable, $_REQUEST, '/bitrix/admin/bx_null.main.null_table.null_table_row.php'); +$tableAdminPage = new TableAdminPage($ormTable, $_REQUEST, '/bitrix/admin/bx_null.main.null_table.row.php'); $tableAdminPage ->checkPermission() ->start() diff --git a/admin/main/submenu/null_table/menu.php b/admin/main/submenu/null_table/menu.php index b5b3494..a50bda3 100644 --- a/admin/main/submenu/null_table/menu.php +++ b/admin/main/submenu/null_table/menu.php @@ -9,4 +9,5 @@ Loc::loadMessages(__FILE__); return (new GlobalMenuItem()) ->setSort(1300) ->setTitle('Null Table') + ->setIcon('iblock_menu_icon_iblocks') ->setUrl(); \ No newline at end of file diff --git a/admin/main/submenu/null_table/submenu/null_table_row/index.php b/admin/main/submenu/null_table/submenu/row/index.php similarity index 100% rename from admin/main/submenu/null_table/submenu/null_table_row/index.php rename to admin/main/submenu/null_table/submenu/row/index.php diff --git a/admin/main/submenu/null_table/submenu/null_table_row/lang/ru/config.php b/admin/main/submenu/null_table/submenu/row/lang/ru/config.php similarity index 100% rename from admin/main/submenu/null_table/submenu/null_table_row/lang/ru/config.php rename to admin/main/submenu/null_table/submenu/row/lang/ru/config.php diff --git a/admin/main/submenu/null_table/submenu/null_table_row/menu.php b/admin/main/submenu/null_table/submenu/row/menu.php similarity index 86% rename from admin/main/submenu/null_table/submenu/null_table_row/menu.php rename to admin/main/submenu/null_table/submenu/row/menu.php index 9c4c4de..9d8826a 100644 --- a/admin/main/submenu/null_table/submenu/null_table_row/menu.php +++ b/admin/main/submenu/null_table/submenu/row/menu.php @@ -8,5 +8,6 @@ Loc::loadMessages(__FILE__); return (new GlobalMenuItem()) ->setSort(1400) ->setTitle('Null Table Row') + ->setIcon('default_menu_icon') ->setVisible(false) ->setUrl(); \ No newline at end of file diff --git a/default_config.php b/default_config.php index 25058db..36ae26b 100644 --- a/default_config.php +++ b/default_config.php @@ -1,5 +1,7 @@ [ + 'Bx\\Null\\Factory\\NullFactory' => ['cache' => ['hit'], 'is_collection_query' => true], + ] ]; \ No newline at end of file