3010

common/modules/documentation/models/SearchDocList.php

@@ -49,7 +49,10 @@ class SearchDocList extends DocList
             $idListInt[] = (int) $_id;
         $query = DocList::find();
         $query->joinWith(['lang']);
-        $query->orderBy([ new \yii\db\Expression('FIELD (`doc_list`.`id`, ' . implode(',', $idListInt) . ')')]);
+
+        $sort = yii::$app->request->get('sort');
+        if (!$sort)
+            $query->orderBy([new \yii\db\Expression('FIELD (`doc_list`.`id`, ' . implode(',', $idListInt) . ')')]);
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
             'sort' => [

common/modules/documentation/views/documentation-list-admin/index.php

@@ -28,10 +28,12 @@ $parentList = $searchModel->getParentList($searchModel, 0, 0, true);
         ],
         [
             'attribute' => 'name',
-            'format'=>'raw',
+            'format' => 'raw',
             'value' => function($model)use($parentList) {
-                return '<p style="white-space: nowrap;">'.$parentList[$model->id . ' '].'</p>';
-//                return $model->lang->name;
+                $sort = yii::$app->request->get('sort');
+                if (!$sort)
+                    return '<p style="white-space: nowrap;">' . $parentList[$model->id . ' '] . '</p>';
+                return $model->lang->name;
             }
         ],
         [