From efa1e8b716d3b6362b4690d4410ced1e1d1de3e6 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 19 Jul 2018 06:32:39 +0530 Subject: [PATCH] making and removing of filter tags is now working --- .../Http/Controllers/DataGridController.php | 43 +- .../Resources/views/datagrid/index.blade.php | 537 +++++++++--------- 2 files changed, 296 insertions(+), 284 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php index 159f4bb3f..791b8fb01 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DataGridController.php @@ -138,33 +138,38 @@ class DataGridController extends Controller 'filterable' => [ [ 'column' => 'a.id', - 'type' => 'integer' + 'type' => 'integer', + 'label' => 'Admin ID' ], [ 'column' => 'a.email', - 'type' => 'string' + 'type' => 'string', + 'label' => 'Admin E-Mail', ], [ 'column' => 'a.first_name', - 'type' => 'string' + 'type' => 'string', + 'label' => 'Admin Name', ] ], 'searchables' =>[ [ 'name' => 'a.id', - 'label' => 'ID' + 'label' => 'ID', + 'label' => 'Admin ID', ], [ 'name' => 'a.name', - 'label' => 'Name' + 'label' => 'Name', + 'label' => 'Admin Name', ] ], 'join' => [ - [ - 'join' => 'leftjoin', - 'table' => 'posts as p', - 'primaryKey' => 'a.id', - 'condition' => '=', - 'secondaryKey' => 'p.author_id', - ] + // [ + // 'join' => 'leftjoin', + // 'table' => 'posts as p', + // 'primaryKey' => 'a.id', + // 'condition' => '=', + // 'secondaryKey' => 'p.author_id', + // ] ], 'columns' => [ [ @@ -181,13 +186,13 @@ class DataGridController extends Controller 'sortable' => true, 'filterable' => true ], - [ - 'name' => 'p.content', - 'type' => 'string', - 'label' => 'Content', - 'sortable' => true, - 'filterable' => false, - ], + // [ + // 'name' => 'p.content as pp', + // 'type' => 'string', + // 'label' => 'Content', + // 'sortable' => true, + // 'filterable' => false, + // ], [ 'name' => 'a.first_name', 'type' => 'string', diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php index 5ae8a576a..cb406f1f9 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php @@ -53,7 +53,7 @@ @@ -159,294 +159,301 @@ @section('javascript') @endsection