Fix redmine search

common/modules/support/controllers/SupportController.php

@@ -52,9 +52,20 @@ class SupportController extends Controller
 
         $user = $client->user->getCurrentUser();
 
-        $models = $client->issue->all([
+        $params = [
             'author_id' => $user['user']['id'],
-        ]);
+        ];
+
+        if(Yii::$app->request->get('s'))
+        {
+            $params = ArrayHelper::merge($params, [
+                'f[]' => 'subject',
+                'op[subject]' => '~',
+                'v[subject][]' => Yii::$app->request->get('s'),
+            ]);
+        }
+
+        $models = $client->issue->all($params);
 
         return $this->render('index', [
             'models' => $models,

common/modules/support/models/redmine/IssueHelper.php

@@ -6,46 +6,50 @@ use common\models\Settings;
 
 class IssueHelper 
 {
-	public static function sort($issues)
+	public static function sort($issues = null)
 	{
-
-		$settings = [
-            [
-                'statuses' => explode(',', Settings::getValue('support-status-work')),
-                'title' => 'Задачи в работе',
-            ],
-            [
-                'statuses' => explode(',', Settings::getValue('support-status-new')),
-                'title' => 'Задачи на оценке',
-            ],
-            [
-                'statuses' => explode(',', Settings::getValue('support-status-test')),
-                'title' => 'Задачи на тестировании',
-            ],
-            [
-                'statuses' => explode(',', Settings::getValue('support-status-approve')),
-                'title' => 'Задачи ожидающие проверки',
-            ],
-            [
-                'statuses' => explode(',', Settings::getValue('support-status-accepted')),
-                'title' => 'Закрытые задачи',
-                'close' => true
-            ],
-        ];
-
-        foreach ($issues as $issue) 
+        if($issues)
         {
-            foreach ($settings as &$setting) 
+    		$settings = [
+                [
+                    'statuses' => explode(',', Settings::getValue('support-status-work')),
+                    'title' => 'Задачи в работе',
+                ],
+                [
+                    'statuses' => explode(',', Settings::getValue('support-status-new')),
+                    'title' => 'Задачи на оценке',
+                ],
+                [
+                    'statuses' => explode(',', Settings::getValue('support-status-test')),
+                    'title' => 'Задачи на тестировании',
+                ],
+                [
+                    'statuses' => explode(',', Settings::getValue('support-status-approve')),
+                    'title' => 'Задачи ожидающие проверки',
+                ],
+                [
+                    'statuses' => explode(',', Settings::getValue('support-status-accepted')),
+                    'title' => 'Закрытые задачи',
+                    'close' => true
+                ],
+            ];
+
+            foreach ($issues as $issue) 
             {
-                if(in_array($issue['status']['id'], $setting['statuses']))
+                foreach ($settings as &$setting) 
                 {
-                    $setting['models'][] = $issue;
+                    if(in_array($issue['status']['id'], $setting['statuses']))
+                    {
+                        $setting['models'][] = $issue;
+                    }
                 }
             }
-        }
 
-        unset($setting);
+            unset($setting);
+
+            return $settings;
+        }
 
-        return $settings;
+        return null;
 	}
 }
\ No newline at end of file

common/modules/support/views/support/index.php

@@ -64,17 +64,18 @@ use common\modules\support\models\redmine\IssueHelper;
                     <td class="no_pad">
 
                         <?php 
-                        $issues = IssueHelper::sort($models['issues']); 
-
-                        foreach ($issues as $issue) 
+                        if($issues = IssueHelper::sort($models['issues']))
                         {
-                            if(!isset($issue['close']))
-                            {
-                                echo $this->render('_loop', ['output' => $issue['models'], 'title' => $issue['title']]);
-                            }
-                            else
+                            foreach ($issues as $issue) 
                             {
-                                $accepteds = $issue['models'];
+                                if(!isset($issue['close']))
+                                {
+                                    echo $this->render('_loop', ['output' => $issue['models'], 'title' => $issue['title']]);
+                                }
+                                else
+                                {
+                                    $accepteds = $issue['models'];
+                                }
                             }
                         }
                         ?>