merge

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index f27fa83f7de13af0c1b071ddb576ba5a91f51fae..0118c6113180ea55e6d163185d076003882b79b9 100644 (file)
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -8,6 +8,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use Yii;
 use yii\base\DynamicModel;
 use yii\data\ActiveDataProvider;
+use yii\data\ArrayDataProvider;
 use yii\db\Exception;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Json;
@@ -112,14 +113,14 @@ class UsersMessageManagementController extends Controller
             }
         }
 
-        return $this->render('index', compact('model', 'tab'));
-    }
+
 
         return $this->render('index', [
             'model' => $model,
             'links' => $dates,
             'month' => $month,
             'year' => $year,
+             'tab' => $tab,
 
         ]);
     }
@@ -333,8 +334,9 @@ class UsersMessageManagementController extends Controller
             'date' => $date,
             'type' => $type,
         ]);
-    public function actionLogs() {
-
+    }
+    public function actionLogs()
+    {
         $model = DynamicModel::validateData([
             'date_from' => date('Y-m-d H:i:s', strtotime('-1 week', time())),
             'date_to' => date('Y-m-d 23:59:59'),