Merge pull request #2100 from LuckyCyborg/4.0

Overall improvements
nova-framework · Aug 11, 2018 · 2deb761 · 2deb761
2 parents bc24ffa + 1170913
commit 2deb761
Show file tree

Hide file tree

Showing 13 changed files with 579 additions and 322 deletions.
diff --git a/app/Config/App.php b/app/Config/App.php
@@ -147,6 +147,7 @@
         'Shared\Auth\AuthServiceProvider',
         'Shared\Backup\BackupServiceProvider',
         'Shared\Cache\CacheServiceProvider',
+        'Shared\DataTable\DataTableServiceProvider',
         'Shared\DomPDF\PdfServiceProvider',
         'Shared\Queue\QueueServiceProvider',
         'Shared\Routing\RoutingServiceProvider',

diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php
@@ -14,7 +14,7 @@
 // Define The Application Version
 //--------------------------------------------------------------------------
 
-define('VERSION', '4.0.80');
+define('VERSION', '4.0.81');
 
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options

diff --git a/modules/Users/Controllers/Admin/Users.php b/modules/Users/Controllers/Admin/Users.php
@@ -26,7 +26,7 @@
 use Nova\Support\Arr;
 use Nova\Support\Str;
 
-use Shared\Support\DataTable;
+use Shared\Support\Facades\DataTable;
 
 use Modules\Platform\Controllers\Admin\BaseController;
 use Modules\Roles\Models\Role;
@@ -149,37 +149,34 @@ protected function validator(array $data, Collection $items, $id = null)
 
     public function data(Request $request)
     {
-        $columns = array(
-            array('data' => 'id',       'name' => 'id'),
-            array('data' => 'username', 'name' => 'username'),
-            array('data' => 'realname', 'name' => 'realname'),
-            array('data' => 'email',    'name' => 'email'),
-
-            array('data' => 'roles', 'name' => 'roles.name', 'uses' => function ($user)
-            {
-                $roles = $user->roles->lists('name');
-
-                return implode(', ', $roles);
-            }),
-
-            array('data' => 'created_at', 'name' => 'created_at', 'uses' => function ($user)
-            {
-                $format = __d('users', '%d %b %Y, %H:%M');
-
-                return $user->created_at->formatLocalized($format);
-            }),
-
-            array('data' => 'actions', 'name' => 'actions', 'uses' => function ($user)
-            {
-                return View::fetch('Modules/Users::Partials/UsersTableActions', compact('user'));
-            }),
-        );
-
         $query = User::with('roles')->where('activated', 1);
 
-        $data = DataTable::handle($query, $request, $columns);
+        $dataTable = DataTable::make($query)
+            ->column('id')
+            ->column('username')
+            ->column('realname')
+            ->column('email');
+
+        $dataTable->column('roles', 'roles.name', function ($user)
+        {
+            $roles = $user->roles->lists('name');
+
+            return implode(', ', $roles);
+        });
+
+        $dataTable->column('created_at', function ($user)
+        {
+            $format = __d('users', '%d %b %Y, %H:%M');
+
+            return $user->created_at->formatLocalized($format);
+        });
+
+        $dataTable->column('actions', function ($user)
+        {
+            return View::fetch('Modules/Users::Partials/UsersTableActions', compact('user'));
+        });
 
-        return Response::json($data);
+        return $dataTable->handle($request);
     }
 
     public function index()

diff --git a/shared/Auth/AuthServiceProvider.php b/shared/Auth/AuthServiceProvider.php
@@ -25,12 +25,12 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->bindShared('command.auth.reminders', function($app)
+        $this->app->singleton('command.auth.reminders', function($app)
         {
             return new RemindersTableCommand($app['files']);
         });
 
-        $this->app->bindShared('command.auth.reminders.clear', function()
+        $this->app->singleton('command.auth.reminders.clear', function()
         {
             return new ClearRemindersCommand;
         });

diff --git a/shared/Cache/CacheServiceProvider.php b/shared/Cache/CacheServiceProvider.php
@@ -9,6 +9,13 @@
 
 class CacheServiceProvider extends ServiceProvider
 {
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer = true;
+
 
     /**
      * Bootstrap the application services.