From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 8 Nov 2024 12:54:16 +0000 (+0300)
Subject: Текущий пользователь в селекте
X-Git-Tag: 1.7~228^2~4
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=86bf1eb9c0cdadafa51129fc3f155d1337d53a09;p=erp24_rep%2Fyii-erp24%2F.git

Текущий пользователь в селекте
---

diff --git a/erp24/controllers/crud/ClusterAdminController.php b/erp24/controllers/crud/ClusterAdminController.php
index 60029c37..6d84ba65 100644
--- a/erp24/controllers/crud/ClusterAdminController.php
+++ b/erp24/controllers/crud/ClusterAdminController.php
@@ -34,7 +34,7 @@ class ClusterAdminController extends Controller
                         [
                             'allow' => true,
                             'actions' => ['view', 'index', 'update', 'delete'],
-                            'roles' => ['clusterAdminEdit'],
+                            'roles' => ['menu/crud/cluster-admin/', 'clusterAdminEdit'],
                         ],
                     ],
                     'denyCallback' => function ($rule, $action) {
@@ -58,10 +58,10 @@ class ClusterAdminController extends Controller
      */
     public function actionIndex()
     {
-        /*if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::DIRECTOR, AdminGroup::GROUP_HR ])) {
+        if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::DIRECTOR, AdminGroup::GROUP_HR ])) {
             return $this->redirect('/');
 
-        }*/
+        }
 
         // Получаем все кусты из таблицы Cluster
         $clusters = Cluster::find()->asArray()->all();
@@ -178,10 +178,10 @@ class ClusterAdminController extends Controller
     public function actionView($id)
     {
 
-        /*if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::DIRECTOR, AdminGroup::GROUP_HR ])) {
+        if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::DIRECTOR, AdminGroup::GROUP_HR ])) {
             return $this->redirect('/');
 
-        }*/
+        }
 
         $user = Yii::$app->user->identity;
 
@@ -296,6 +296,8 @@ class ClusterAdminController extends Controller
             }
         }
 
+
+
         $user = Yii::$app->user->identity;
         $model->active = 1;
         return $this->render('create', [
@@ -316,10 +318,10 @@ class ClusterAdminController extends Controller
      */
     public function actionUpdate($id)
     {
-       /* if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::DIRECTOR, AdminGroup::GROUP_HR ])) {
+        if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::DIRECTOR, AdminGroup::GROUP_HR ])) {
             return $this->redirect('/');
 
-        }*/
+        }
         $model = $this->findModel($id);
 
         $allAdmins = Admin::find()
@@ -339,6 +341,22 @@ class ClusterAdminController extends Controller
             return !in_array($admin['id'], $activeAdminIds);
         });
 
+        if (!isset($allAdmins[$model->admin_id])) {
+            $currentAdmin = Admin::find()
+                ->select(['id', 'name'])
+                ->where(['id' => $model->admin_id])
+                ->asArray()
+                ->one();
+
+            if ($currentAdmin) {
+                $allAdmins[$currentAdmin['id']] = $currentAdmin['name'];
+            }
+        }
+
+        if (!isset($inactiveAdmins[$model->admin_id])) {
+            $inactiveAdmins[$model->admin_id] = $allAdmins[$model->admin_id];
+        }
+
 
         $cluster = Cluster::findOne($model->cluster_id);
         if (!$cluster) {
@@ -436,10 +454,10 @@ class ClusterAdminController extends Controller
      */
     public function actionDelete($id)
     {
-        /*if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::DIRECTOR, AdminGroup::GROUP_HR ])) {
+        if (!in_array(Admin::findOne([Yii::$app->user->id])->group_id, [AdminGroup::GROUP_IT, AdminGroup::DIRECTOR, AdminGroup::GROUP_HR ])) {
             return $this->redirect('/');
 
-        }*/
+        }
 
         $model = $this->findModel($id);
         $this->findModel($id)->delete();