Merge pull request #1679 from NextDom/SonarViewControllerFix

Fix viewController
NextDom · Feb 23, 2020 · 20cd0b5 · 20cd0b5
2 parents 19985cf + 8a23fdd
commit 20cd0b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/Controller/Pages/ViewController.php b/src/Controller/Pages/ViewController.php
@@ -46,39 +46,38 @@ class ViewController extends BaseController
      * @return string Content of view page
      *
      * @throws CoreException
+     * @throws \ReflectionException
      */
     public static function get(&$pageData): string
     {
-        $pageData['viewsList'] = ViewManager::all();
+        $allViews = ViewManager::all();
+        $viewId = Utils::init(AjaxParams::VIEW_ID);
         $pageData['viewHideList'] = true;
         $pageData['viewIsAdmin'] = AuthentificationHelper::isConnectedAsAdmin();
         $pageData['viewDefault'] = UserManager::getStoredUser()->getOptions('displayViewByDefault');
         $pageData['viewNoControl'] = Utils::init('noControl');
+        $pageData['viewsList'] = $allViews;
 
         $currentView = null;
-        if (Utils::init(AjaxParams::VIEW_ID) == '') {
-
-            if (UserManager::getStoredUser()->getOptions('defaultDesktopView') != '') {
-                $currentView = ViewManager::byId(UserManager::getStoredUser()->getOptions('defaultDesktopView'));
+        if (empty($viewId)) {
+            $defaultDesktopView = UserManager::getStoredUser()->getOptions('defaultDesktopView');
+            if (!empty($defaultDesktopView)) {
+                $currentView = ViewManager::byId($defaultDesktopView);
             }
-
-            if (!is_object($currentView) && is_array($pageData['viewsList']) && count($pageData['viewsList']) > 0) {
-                $currentView = $pageData['viewsList'][0];
+            if (!is_object($currentView) && is_array($allViews) && count($allViews) > 0) {
+                $currentView = $allViews[0];
             }
         } else {
-            $currentView = ViewManager::byId(Utils::init(AjaxParams::VIEW_ID));
-
+            $currentView = ViewManager::byId($viewId);
             if (!is_object($currentView)) {
-                throw new CoreException('{{Vue inconnue. Vérifier l\'ID.}}');
+                throw new CoreException(__('Vue inconnue. Vérifier l\'ID.'));
             }
         }
-
         if (!is_object($currentView)) {
             throw new CoreException(__('Aucune vue n\'existe, cliquez <a href="index.php?v=d&p=view_edit">ici</a> pour en créer une.'));
         }
         $pageData['viewCurrent'] = $currentView;
-
-        if (UserManager::getStoredUser()->getOptions('displayViewByDefault') == 1 && Utils::init('report') != 1) {
+        if ($pageData['viewDefault'] == 1 && Utils::init('report') != 1) {
             $pageData['viewHideList'] = false;
         }
         $pageData[ControllerData::JS_VARS][AjaxParams::VIEW_ID] = $currentView->getId();

diff --git a/tests/phpunit_tests/Ajax/CronAjaxTest.php b/tests/phpunit_tests/Ajax/CronAjaxTest.php
@@ -59,6 +59,6 @@ public function testStart()
         sleep(10);
         $jsonResult = json_decode($result, true);
         $this->assertEquals('ok', $jsonResult['state']);
-        $this->assertStringContainsString('CRON ERROR', LogHelper::get('plugin4tests')[0]);
+        $this->assertStringContainsString('CRON ERROR', implode(LogHelper::get('plugin4tests')));
     }
 }