Merge pull request #92 from balajidharma/2.x-Changes

Added Filter

Author: balajidharma

app/Grid/Admin/CategoryTypeGrid.php

@@ -23,6 +23,7 @@ public function columns()
                 'label' => __('ID'),
                 'sortable' => true,
                 'searchable' => true,
+                'filter' => '=',
                 'form_options' => function ($model) {
                     return [
                         'hide' => true,
@@ -77,6 +78,7 @@ public function columns()
                 'label' => __('Use Flat Category'),
                 'sortable' => true,
                 'searchable' => true,
+                'filter' => '=',
                 'type' => 'checkbox',
                 'value' => function ($model) {
                     return $model->is_flat ? __('Yes') : __('No');
@@ -91,7 +93,10 @@ public function columns()
             GridHelper::getTagsField('admin_tags', config('admin.tag_name')),
             [
                 'attribute' => 'created_at',
+                'label' => __('Created At'),
                 'sortable' => true,
+                'filter' => 'between',
+                'fillable' => false
             ],
             [
                 'attribute' => 'updated_at',

app/Grid/Admin/CommentGrid.php

@@ -18,12 +18,18 @@ class CommentGrid extends CrudBuilder
 
     public function columns()
     {
+        $statusOptions = [];
+        foreach (config('comment.status') as $key => $value) {
+            $statusOptions[$value] = __($key);
+        };
+
         return [
             [
                 'attribute' => 'id',
                 'label' => __('ID'),
                 'sortable' => true,
                 'searchable' => true,
+                'filter' => '=',
                 'list' => [
                     'class' => 'BalajiDharma\LaravelCrud\Column\LinkColumn',
                     'route' => 'admin.comment.show',
@@ -35,6 +41,7 @@ public function columns()
                 'attribute' => 'content',
                 'label' => __('Content'),
                 'searchable' => true,
+                'filter' => 'like',
                 'list' => [
                     'class' => 'BalajiDharma\LaravelCrud\Column\LinkColumn',
                     'route' => 'admin.comment.show',
@@ -120,17 +127,14 @@ public function columns()
                 'attribute' => 'status',
                 'label' => __('Status'),
                 'type' => 'select',
+                'filter' => '=',
+                'filter_options' => $statusOptions,
                 'value' => function ($model) {
                     return __(array_flip(config('comment.status'))[$model->status]);
                 },
-                'form_options' => function ($model) {
-                    $status = [];
-                    foreach (config('comment.status') as $key => $value) {
-                        $status[$value] = __($key);
-                    };
-
+                'form_options' => function ($model) use ($statusOptions) {
                     return [
-                        'choices' => $status,
+                        'choices' => $statusOptions,
                         'default_value' => $model ? $model->status : null,
                     ];
                 },

app/Grid/Admin/MediaGrid.php

@@ -35,6 +35,15 @@ public function columns()
                     ];
                 },
             ],
+            [
+                'attribute' => 'variant_name',
+                'label' => __('Type'),
+                'type' => 'select',
+                'filter' => '=',
+                'filter_options' => media_type_as_options(),
+                'list' => false,
+                'show' => false
+            ],
             [
                 'attribute' => 'filename',
                 'fillable' => true,

app/Grid/Admin/MenuGrid.php

@@ -23,6 +23,7 @@ public function columns()
                 'label' => __('ID'),
                 'sortable' => true,
                 'searchable' => true,
+                'filter' => true,
                 'form_options' => function ($model) {
                     return [
                         'hide' => true,

app/Grid/Admin/PermissionGrid.php

@@ -31,6 +31,7 @@ public function columns()
                 'label' => __('ID'),
                 'sortable' => true,
                 'searchable' => true,
+                'filter' => '=',
                 'list' => [
                     'class' => 'BalajiDharma\LaravelCrud\Column\LinkColumn',
                     'route' => 'admin.permission.show',

app/Grid/Admin/RoleGrid.php

@@ -24,6 +24,7 @@ public function columns()
                 'label' => __('ID'),
                 'sortable' => true,
                 'searchable' => true,
+                'filter' => '=',
                 'list' => [
                     'class' => 'BalajiDharma\LaravelCrud\Column\LinkColumn',
                     'route' => 'admin.role.show',

app/Grid/Admin/ThreadGrid.php

@@ -19,12 +19,15 @@ class ThreadGrid extends CrudBuilder
 
     public function columns()
     {
+        $type = CategoryType::where('machine_name', config('forum.category_name'))->first();
+        $categories = $type ? Category::selectOptions($type->id) : [];
         return [
             [
                 'attribute' => 'id',
                 'label' => __('ID'),
                 'sortable' => true,
                 'searchable' => true,
+                'filter' => '=',
                 'list' => [
                     'class' => 'BalajiDharma\LaravelCrud\Column\LinkColumn',
                     'route' => 'admin.thread.show',
@@ -37,12 +40,15 @@ public function columns()
                 'label' => __('Category'),
                 'type' => 'select',
                 'fillable' => true,
+                'sortable' => true,
+                'filter' => '=',
+                'filter_options' => $categories,
+                'relation' => 'modelCategories',
+                'relation_field' => 'id',
                 'value' => function ($model) {
                     return $model ? optional($model->getCategoriesByType(config('forum.category_name'))->first())->name : null;
                 },
-                'form_options' => function ($model) {
-                    $type = CategoryType::where('machine_name', config('forum.category_name'))->first();
-                    $categories = $type ? Category::selectOptions($type->id) : [];
+                'form_options' => function ($model) use ($categories) {
                     return [
                         'choices' => $categories,
                         'empty_value' => __('Select an option'),
@@ -78,6 +84,7 @@ public function columns()
             [
                 'attribute' => 'content',
                 'label' => __('Content'),
+                'filter' => 'like',
                 'form_options' => function ($model) {
                     return [
                         'field_type' => 'textarea',

app/Grid/Admin/UserGrid.php

@@ -24,6 +24,7 @@ public function columns()
                 'label' => __('ID'),
                 'sortable' => true,
                 'searchable' => true,
+                'filter' => '=',
                 'list' => [
                     'class' => 'BalajiDharma\LaravelCrud\Column\LinkColumn',
                     'route' => 'admin.user.show',
@@ -47,6 +48,7 @@ public function columns()
             [
                 'attribute' => 'email',
                 'label' => __('Email'),
+                'filter' => 'like',
                 'sortable' => true,
                 'searchable' => true,
             ],

app/Http/Controllers/Admin/PermissionController.php

@@ -22,7 +22,10 @@ public function index()
         $this->authorize('adminViewAny', Permission::class);
         $permissions = (new Permission)->newQuery();
 
-        $crud = (new PermissionGrid)->list($permissions);
+        $crud = (new PermissionGrid)
+                    ->setDisplaySearch(true)
+                    ->setDisplayFilters(false)
+                    ->list($permissions);
 
         return view('admin.crud.index', compact('crud'));
     }

config/mediable.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'model' => BalajiDharma\LaravelMediaManager\Models\Media::class,
+];