add backend friendly search, remove unused use declare

liufee · liufee · commit 794cf018ad3e · 2017-10-17T17:11:41.000+08:00
diff --git a/api/config/params.php b/api/config/params.php
@@ -1,5 +1,4 @@
 <?php
 return [
     'adminEmail' => 'admin@example.com',
-    'cookbookResourceBaseUrl' => 'http://img.feehi.com/cookbook/'
 ];
diff --git a/api/controllers/ArticleController.php b/api/controllers/ArticleController.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Author: lf
+ * Blog: https://blog.feehi.com
+ * Email: job@feehi.com
+ * Created at: 2017-08-30 18:10
+ */
 namespace api\controllers;
 
 use yii\web\Response;
diff --git a/api/controllers/SiteController.php b/api/controllers/SiteController.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Author: lf
+ * Blog: https://blog.feehi.com
+ * Email: job@feehi.com
+ * Created at: 2017-08-30 18:10
+ */
 namespace api\controllers;
 
 use yii\web\Response;
diff --git a/api/controllers/UserController.php b/api/controllers/UserController.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Author: lf
+ * Blog: https://blog.feehi.com
+ * Email: job@feehi.com
+ * Created at: 2017-08-30 18:10
+ */
 namespace api\controllers;
 
 use yii\web\Response;
diff --git a/api/models/Article.php b/api/models/Article.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Administrator
- * Date: 2017/8/30
- * Time: 18:10
+ * Author: lf
+ * Blog: https://blog.feehi.com
+ * Email: job@feehi.com
+ * Created at: 2017-08-30 18:10
  */
 namespace api\models;
 
diff --git a/api/models/User.php b/api/models/User.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Administrator
- * Date: 2017/8/30
- * Time: 19:04
+ * Author: lf
+ * Blog: https://blog.feehi.com
+ * Email: job@feehi.com
+ * Created at: 2017-08-30 19:04
  */
 
 namespace api\models;
diff --git a/api/tests/_support/_generated/FunctionalTesterActions.php b/api/tests/_support/_generated/FunctionalTesterActions.php
@@ -1,4 +1,4 @@
-<?php  //[STAMP] f4d3bab444f1c55490e25f3fd444ca23
+<?php  //[STAMP] cec1f7dfb20eb8f5d749e9bb5f8453b6
 namespace api\tests\_generated;
 
 // This class was automatically generated by build task
@@ -836,17 +836,6 @@ public function amHttpAuthenticated($username, $password) {
      * ?>
      * ```
      *
-     * To use special chars in Header Key use HTML Character Entities:
-     * Example:
-     * Header with underscore - 'Client_Id'
-     * should be represented as - 'Client&#x0005F;Id' or 'Client&#95;Id'
-     *
-     * ```php
-     * <?php
-     * $I->haveHttpHeader('Client&#95;Id', 'Codeception');
-     * ?>
-     * ```
-     *
      * @param string $name the name of the request header
      * @param string $value the value to set it to for subsequent
      *        requests
@@ -1495,7 +1484,7 @@ public function dontSeeCurrentUrlMatches($uri) {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Executes the given regular expression against the current URI and returns the first capturing group.
+     * Executes the given regular expression against the current URI and returns the first match.
      * If no parameters are provided, the full URI is returned.
      *
      * ``` php
diff --git a/api/tests/_support/_generated/UnitTesterActions.php b/api/tests/_support/_generated/UnitTesterActions.php
@@ -1,4 +1,4 @@
-<?php  //[STAMP] 0112931fc08f5c9260ba0fcaec985a07
+<?php  //[STAMP] b1dac402910735827e4b7d4b72b3fed2
 namespace api\tests\_generated;
 
 // This class was automatically generated by build task
diff --git a/backend/actions/CreateAction.php b/backend/actions/CreateAction.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Author: lf
  * Blog: https://blog.feehi.com
diff --git a/backend/config/main.php b/backend/config/main.php
@@ -22,6 +22,9 @@
             'idParam' => '__backend__id',
             'returnUrlParam' => '_backend_returnUrl',
         ],
+        'session' => [
+            'timeout' => 1440,//session过期时间，单位为秒
+        ],
         'log' => [//此项具体详细配置，请访问http://wiki.feehi.com/index.php?title=Yii2_log
             'traceLevel' => YII_DEBUG ? 3 : 0,
             'targets' => [
diff --git a/backend/controllers/FriendlyLinkController.php b/backend/controllers/FriendlyLinkController.php
@@ -8,7 +8,8 @@
 
 namespace backend\controllers;
 
-use yii\data\ActiveDataProvider;
+use Yii;
+use backend\models\search\FriendlyLinkSearch;
 use backend\models\FriendlyLink;
 use backend\actions\CreateAction;
 use backend\actions\UpdateAction;
@@ -28,18 +29,11 @@ public function actions()
             'index' => [
                 'class' => IndexAction::className(),
                 'data' => function(){
-                    $query = FriendlyLink::find();
-                    $dataProvider = new ActiveDataProvider([
-                        'query' => $query,
-                        'sort' => [
-                            'defaultOrder' => [
-                                'sort' => SORT_ASC,
-                                'id' => SORT_ASC,
-                            ],
-                        ]
-                    ]);
+                    $searchModel = new FriendlyLinkSearch();
+                    $dataProvider = $searchModel->search(yii::$app->getRequest()->getQueryParams());
                     return [
                         'dataProvider' => $dataProvider,
+                        'searchModel' => $searchModel,
                     ];
                 }
             ],
diff --git a/backend/models/search/FriendlyLinkSearch.php b/backend/models/search/FriendlyLinkSearch.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Author: lf
+ * Blog: https://blog.feehi.com
+ * Email: job@feehi.com
+ * Created at: 2017-10-16 16:02
+ */
+
+namespace backend\models\search;
+
+use backend\models\FriendlyLink;
+use yii\data\ActiveDataProvider;
+
+class FriendlyLinkSearch extends \backend\models\FriendlyLink
+{
+
+    public $create_start_at;
+
+    public $create_end_at;
+
+    public $update_start_at;
+
+    public $update_end_at;
+
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name', 'url'], 'string'],
+            [['status', 'image'], 'integer'],
+            [['create_start_at', 'create_end_at', 'update_start_at', 'update_end_at'], 'string'],
+        ];
+    }
+
+    /**
+     * @param $params
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = FriendlyLink::find();
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+            'sort' => [
+                'defaultOrder' => [
+                    'sort' => SORT_ASC,
+                    'id' => SORT_DESC,
+                ]
+            ]
+        ]);
+        $this->load($params);
+        if (! $this->validate()) {
+            return $dataProvider;
+        }
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['status' => $this->status])
+            ->andFilterWhere(['like', 'url', $this->url]);
+        if ($this->image == 1) {
+            $query->andWhere(['<>', 'image', '']);
+        } else {
+            if ($this->image === '0') {
+                $query->andWhere(['image' => '']);
+            }
+        }
+        $create_start_at_unixtimestamp = $create_end_at_unixtimestamp = $update_start_at_unixtimestamp = $update_end_at_unixtimestamp = '';
+        if ($this->create_start_at != '') {
+            $create_start_at_unixtimestamp = strtotime($this->create_start_at);
+        }
+        if ($this->create_end_at != '') {
+            $create_end_at_unixtimestamp = strtotime($this->create_end_at);
+        }
+        if ($this->update_start_at != '') {
+            $update_start_at_unixtimestamp = strtotime($this->update_start_at);
+        }
+        if ($this->update_end_at != '') {
+            $update_end_at_unixtimestamp = strtotime($this->update_end_at);
+        }
+        if ($create_start_at_unixtimestamp != '' && $create_end_at_unixtimestamp == '') {
+            $query->andFilterWhere(['>', 'created_at', $create_start_at_unixtimestamp]);
+        } elseif ($create_start_at_unixtimestamp == '' && $create_end_at_unixtimestamp != '') {
+            $query->andFilterWhere(['<', 'created_at', $create_end_at_unixtimestamp]);
+        } else {
+            $query->andFilterWhere([
+                'between',
+                'created_at',
+                $create_start_at_unixtimestamp,
+                $create_end_at_unixtimestamp
+            ]);
+        }
+
+        if ($update_start_at_unixtimestamp != '' && $update_end_at_unixtimestamp == '') {
+            $query->andFilterWhere(['>', 'updated_at', $update_start_at_unixtimestamp]);
+        } elseif ($update_start_at_unixtimestamp == '' && $update_end_at_unixtimestamp != '') {
+            $query->andFilterWhere(['<', 'updated_at', $update_start_at_unixtimestamp]);
+        } else {
+            $query->andFilterWhere([
+                'between',
+                'updated_at',
+                $update_start_at_unixtimestamp,
+                $update_end_at_unixtimestamp
+            ]);
+        }
+        return $dataProvider;
+    }
+
+}
diff --git a/backend/views/admin-user/update.php b/backend/views/admin-user/update.php
@@ -13,7 +13,6 @@
 ];
 /**
  * @var $model backend\models\User
- * @var $rolesModel backend\models\AdminRoleUser
  */
 ?>
 <?php
diff --git a/backend/views/article/index.php b/backend/views/article/index.php
@@ -8,7 +8,7 @@
 
 /**
  * @var $dataProvider yii\data\ActiveDataProvider
- * @var $searchModel backend\models\ArticleSearch
+ * @var $searchModel backend\models\search\ArticleSearch
  */
 
 use backend\grid\DateColumn;
diff --git a/backend/views/comment/index.php b/backend/views/comment/index.php
@@ -9,7 +9,7 @@
 /**
  * @var $this yii\web\View
  * @var $dataProvider backend\models\Comment
- * @var $searchModel backend\models\CommentSearch
+ * @var $searchModel backend\models\search\CommentSearch
  */
 
 use backend\grid\DateColumn;
diff --git a/backend/views/friendly-link/index.php b/backend/views/friendly-link/index.php
@@ -9,6 +9,7 @@
 /**
  * @var $this yii\web\View
  * @var $dataProvider yii\data\ActiveDataProvider
+ * @var $searchModel backend\models\search\FriendlyLinkSearch
  */
 
 use backend\grid\DateColumn;
@@ -19,6 +20,7 @@
 use yii\helpers\Html;
 use backend\grid\CheckboxColumn;
 use backend\grid\ActionColumn;
+use common\libs\Constants;
 
 $this->title = "Friendly Links";
 $this->params['breadcrumbs'][] = yii::t('app', 'Friendly Links');
@@ -31,6 +33,7 @@
                 <?= Bar::widget() ?>
                 <?= GridView::widget([
                     'dataProvider' => $dataProvider,
+                    'filterModel' => $searchModel,
                     'columns' => [
                         [
                             'class' => CheckboxColumn::className(),
@@ -49,15 +52,34 @@
                             'class' => SortColumn::className()
                         ],
                         [
-                            'class' => StatusColumn::className()
+                            'class' => StatusColumn::className(),
+                            'filter' => Constants::getYesNoItems(),
                         ],
                         [
                             'class' => DateColumn::className(),
                             'attribute' => 'created_at',
+                            'filter' => Html::activeInput('text', $searchModel, 'create_start_at', [
+                                    'class' => 'form-control layer-date',
+                                    'placeholder' => '',
+                                    'onclick' => "laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'});"
+                                ]) . Html::activeInput('text', $searchModel, 'create_end_at', [
+                                    'class' => 'form-control layer-date',
+                                    'placeholder' => '',
+                                    'onclick' => "laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
+                                ]),
                         ],
                         [
                             'class' => DateColumn::className(),
                             'attribute' => 'updated_at',
+                            'filter' => Html::activeInput('text', $searchModel, 'update_start_at', [
+                                    'class' => 'form-control layer-date',
+                                    'placeholder' => '',
+                                    'onclick' => "laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
+                                ]) . Html::activeInput('text', $searchModel, 'update_end_at', [
+                                    'class' => 'form-control layer-date',
+                                    'placeholder' => '',
+                                    'onclick' => "laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
+                                ]),
                         ],
                         [
                             'class' => ActionColumn::className(),
diff --git a/backend/views/log/index.php b/backend/views/log/index.php
@@ -9,7 +9,7 @@
 /**
  * @var $this yii\web\View
  * @var $dataProvider backend\models\AdminLog
- * @var $searchModel backend\models\AdminLogSearch
+ * @var $searchModel backend\models\search\AdminLogSearch
  */
 
 use backend\grid\DateColumn;
diff --git a/backend/views/menu/index.php b/backend/views/menu/index.php
@@ -9,7 +9,7 @@
 /**
  * @var $this yii\web\View
  * @var $dataProvider yii\data\ArrayDataProvider
- * @var $searchModel backend\models\MenuSearch
+ * @var $searchModel backend\models\search\MenuSearch
  */
 
 use backend\grid\DateColumn;
diff --git a/backend/views/page/index.php b/backend/views/page/index.php
@@ -9,7 +9,7 @@
 /**
  * @var $this yii\web\View
  * @var $dataProvider yii\data\ActiveDataProvider
- * @var $searchModel backend\models\ArticleSearch
+ * @var $searchModel backend\models\search\ArticleSearch
  */
 
 use backend\grid\DateColumn;
diff --git a/backend/views/user/index.php b/backend/views/user/index.php
@@ -9,7 +9,7 @@
 /**
  * @var $this yii\web\View
  * @var $dataProvider frontend\models\User
- * @var $searchModel backend\models\UserSearch
+ * @var $searchModel backend\models\search\UserSearch
  */
 
 use backend\grid\DateColumn;
diff --git a/common/config/test.php b/common/config/test.php
@@ -4,8 +4,8 @@
     'basePath' => dirname(__DIR__),
     'components' => [
         'user' => [
-            'class' => 'yii\web\User',
-            'identityClass' => 'backend\models\User',
+            'class' => yii\web\User::className(),
+            'identityClass' => backend\models\User::className(),
         ],
     ],
 ];
diff --git a/common/helpers/FamilyTree.php b/common/helpers/FamilyTree.php
diff --git a/common/models/meta/ArticleMetaLike.php b/common/models/meta/ArticleMetaLike.php
diff --git a/frontend/config/main.php b/frontend/config/main.php
diff --git a/frontend/models/form/ArticlePasswordForm.php b/frontend/models/form/ArticlePasswordForm.php

-Original file line number
+Diff line change
@@ @@ -1,5 +1,4 @@ @@
 <?php
 return [
     'adminEmail' => '[email protected]',
 -    'cookbookResourceBaseUrl' => 'http://img.feehi.com/cookbook/'
 ];
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php //[STAMP] 0112931fc08f5c9260ba0fcaec985a07`
	`1`	`+<?php //[STAMP] b1dac402910735827e4b7d4b72b3fed2`
`2`	`2`	`namespace api\tests\_generated;`
`3`	`3`
`4`	`4`	`// This class was automatically generated by build task`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<?php`
`2`		`-`
`3`	`2`	`/**`
`4`	`3`	`* Author: lf`
`5`	`4`	`* Blog: https://blog.feehi.com`