From d7668599a7f9a613c2608f61bd3df63fa911286a Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 8 Sep 2025 16:36:53 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D1=81=D1=82=D1=83=D0=BF=D1=8B=20?=
 =?utf8?q?=D0=B8=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/MatrixTypeController.php | 14 ++++++++++++++
 erp24/views/matrix-type/index.php          | 12 ++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/erp24/controllers/MatrixTypeController.php b/erp24/controllers/MatrixTypeController.php
index c3ae5af9..c41d8224 100644
--- a/erp24/controllers/MatrixTypeController.php
+++ b/erp24/controllers/MatrixTypeController.php
@@ -4,6 +4,8 @@ namespace app\controllers;
 
 use Throwable;
 use Yii;
+use yii_app\records\Admin;
+use yii_app\records\AdminGroup;
 use yii_app\records\MatrixType;
 use yii\data\ActiveDataProvider;
 use yii\web\Controller;
@@ -34,6 +36,9 @@ class MatrixTypeController extends Controller
      */
     public function actionIndex()
     {
+        if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::GROUP_BUSH_CHEF_FLORIST, AdminGroup::GROUP_BUSH_DIRECTOR])) {
+            return $this->render('/site/index');
+        }
         $searchModel = new MatrixTypeSearch();
         $dataProvider = $searchModel->search(\Yii::$app->request->queryParams);
 
@@ -51,6 +56,9 @@ class MatrixTypeController extends Controller
      */
     public function actionView($id)
     {
+        if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::GROUP_BUSH_CHEF_FLORIST, AdminGroup::GROUP_BUSH_DIRECTOR])) {
+            return $this->render('/site/index');
+        }
         return $this->render('view', [
             'model' => $this->findModel($id),
         ]);
@@ -63,6 +71,9 @@ class MatrixTypeController extends Controller
      */
     public function actionCreate()
     {
+        if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::GROUP_BUSH_CHEF_FLORIST, AdminGroup::GROUP_BUSH_DIRECTOR])) {
+            return $this->render('/site/index');
+        }
         $model = new MatrixType();
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
@@ -83,6 +94,9 @@ class MatrixTypeController extends Controller
      */
     public function actionUpdate($id)
     {
+        if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::GROUP_BUSH_CHEF_FLORIST, AdminGroup::GROUP_BUSH_DIRECTOR])) {
+            return $this->render('/site/index');
+        }
         $model = $this->findModel($id);
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
diff --git a/erp24/views/matrix-type/index.php b/erp24/views/matrix-type/index.php
index 181ddb53..944ff8e2 100644
--- a/erp24/views/matrix-type/index.php
+++ b/erp24/views/matrix-type/index.php
@@ -49,8 +49,8 @@ $this->registerJsFile('/js/matrix-type/index.js', ['position' => \yii\web\View::
                         <div class="modal-body">
                             <input type="hidden" name="parent_id" value="<?= 0 ?>">
                             <div class="mb-3">
-                                <label class="form-label">Название</label>
-                                <input type="text" name="name" class="form-control" required>
+                                <label for="nameCreateGropField" class="form-label">Название</label>
+                                <input id="nameCreateGropField" type="text" name="name" class="form-control" required>
                             </div>
                             <div class="alert alert-danger d-none js-form-error"></div>
                         </div>
@@ -177,8 +177,8 @@ $this->registerJsFile('/js/matrix-type/index.js', ['position' => \yii\web\View::
                                 <form class="ajax-form" data-action="<?= $editUrl ?>" data-success="rename" data-id="<?= $id ?>">
                                     <div class="modal-body">
                                         <div class="mb-3">
-                                            <label class="form-label">Название</label>
-                                            <input type="text" name="name" class="form-control" value="<?= Html::encode($model->name) ?>" required>
+                                            <label for="nameEditField<?= $id ?>" class="form-label">Название</label>
+                                            <input id="nameEditField<?= $id ?>" type="text" name="name" class="form-control" value="<?= Html::encode($model->name) ?>" required>
                                         </div>
                                         <div class="alert alert-danger d-none js-form-error"></div>
                                     </div>
@@ -205,8 +205,8 @@ $this->registerJsFile('/js/matrix-type/index.js', ['position' => \yii\web\View::
                                     <div class="modal-body">
                                         <input type="hidden" name="parent_id" value="<?= $id ?>">
                                         <div class="mb-3">
-                                            <label class="form-label">Название</label>
-                                            <input type="text" name="name" class="form-control" required>
+                                            <label for="nameCreateField<?= $id ?>" class="form-label">Название</label>
+                                            <input id="nameCreateField<?= $id ?>" type="text" name="name" class="form-control" required>
                                         </div>
                                         <div class="alert alert-danger d-none js-form-error"></div>
                                     </div>
-- 
2.39.5