From 446e8fe0f95e52d0b326f54f11c21739c418ccca Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Tue, 17 Sep 2024 14:06:30 +0300 Subject: [PATCH] =?utf8?q?[ERP-188]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?utf8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20=D0=BE?= =?utf8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?utf8?q?=D0=BC=D0=B5=D0=BD=D1=8E,=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20?= =?utf8?q?=D1=81=D0=BA=D1=80=D1=8B=D1=82=D1=8C=20=D0=BC=D0=B5=D0=BD=D1=8E?= =?utf8?q?=20=D0=BD=D0=B5=20=D0=BB=D0=B8=D1=88=D0=B0=D1=8F=20=D0=BF=D1=80?= =?utf8?q?=D0=B0=D0=B2=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/CrmMenu.php | 2 +- erp24/views/auth/menu.php | 2 ++ erp24/web/js/site/get_menu.js | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/erp24/records/CrmMenu.php b/erp24/records/CrmMenu.php index 68e03924..1dd573ac 100755 --- a/erp24/records/CrmMenu.php +++ b/erp24/records/CrmMenu.php @@ -79,7 +79,7 @@ class CrmMenu extends ActiveRecord public static function getTreeByUserId($admin_id): array { $permissions = array_keys(\Yii::$app->authManager->getPermissionsByUser($admin_id)); - $all = self::find()->select(['id', 'parent_id', 'name', 'icon_file', 'url']) + $all = self::find()->select(['id', 'parent_id', 'name', 'icon_file', 'url', 'visible']) ->orderBy('posit') ->all(); $tree = []; diff --git a/erp24/views/auth/menu.php b/erp24/views/auth/menu.php index b1e68625..d090cdb5 100644 --- a/erp24/views/auth/menu.php +++ b/erp24/views/auth/menu.php @@ -79,6 +79,8 @@ $this->registerJsFile('/js/auth/menu.js', ['position' => \yii\web\View::POS_END] field($menu, 'menu_close')->checkbox([], false)->label(false)) ?> +field($menu, 'visible')->checkbox([], false)->label(false)) ?> + field($menu, 'dynamic_list') ->dropDownList($dynamic_list)->label(false)) ?> diff --git a/erp24/web/js/site/get_menu.js b/erp24/web/js/site/get_menu.js index 90923e03..7229f35b 100644 --- a/erp24/web/js/site/get_menu.js +++ b/erp24/web/js/site/get_menu.js @@ -15,6 +15,9 @@ function loadMenu(menu) { ul.setAttribute('id', 'main_menu_l'); $.each(menu[0], function(ind) { var mass = this; + if (!mass.visible) { + return; + } let li = document.createElement('LI'); li.classList.add('slide'); let a = document.createElement('A'); @@ -40,6 +43,9 @@ function loadMenu(menu) { ul2.classList.add('slide-menu'); $.each(menu[mass.id], function(ind2) { let mass2 = this; + if (!mass2.visible) { + return; + } let li2 = document.createElement('LI'); let a2 = document.createElement('A'); li2.appendChild(a2); @@ -65,6 +71,9 @@ function loadMenu(menu) { ul3.classList.add('sub-slide-menu2'); $.each(menu[mass2.id], function(ind3) { let mass3 = this; + if (!mass3.visible) { + return; + } let li3 = document.createElement('LI'); let a3 = document.createElement('A'); a3.classList.add('sub-slide-item2'); -- 2.39.5