Merge pull request #228 from Laravel-Backpack/4.1

Added support for Backpack 4.1

composer.json

@@ -36,7 +36,7 @@
     "prefer-stable": true,
     "require": {
         "spatie/laravel-permission": "^3.0",
-        "backpack/crud": "^4.0.0"
+        "backpack/crud": "^4.1.0"
     },
     "require-dev": {
         "phpunit/phpunit" : "^9.0||^7.0",

src/PermissionManagerServiceProvider.php

@@ -44,6 +44,9 @@ public function boot()
 
         // publish translation files
         $this->publishes([__DIR__.'/resources/lang' => resource_path('lang/vendor/backpack')], 'lang');
+
+        // publish migration from Backpack 4.0 to Backpack 4.1
+        $this->publishes([__DIR__.'/database/migrations' => database_path('migrations')], 'migrations');
     }
 
     /**

src/app/Http/Controllers/RoleCrudController.php

@@ -43,6 +43,17 @@ public function setupListOperation()
             'label' => trans('backpack::permissionmanager.name'),
             'type'  => 'text',
         ]);
+        $this->crud->addColumn([   // select_multiple: n-n relationship (with pivot table)
+            'label'     => trans('backpack::permissionmanager.users'), // Table column heading
+            'type'      => 'relationship_count',
+            'name'      => 'users', // the method that defines the relationship in your Model
+            'wrapper'   => [
+                'href' => function ($crud, $column, $entry, $related_key) {
+                    return backpack_url('user?role='.$entry->getKey());
+                },
+            ],
+            'suffix'    => ' users',
+        ]);
         if (config('backpack.permissionmanager.multiple_guards')) {
             $this->crud->addColumn([
                 'name'  => 'guard_name',

src/app/Http/Controllers/UserCrudController.php

@@ -102,8 +102,8 @@ public function setupUpdateOperation()
      */
     public function store()
     {
-        $this->crud->request = $this->crud->validateRequest();
-        $this->crud->request = $this->handlePasswordInput($this->crud->request);
+        $this->crud->setRequest($this->crud->validateRequest());
+        $this->crud->setRequest($this->handlePasswordInput($this->crud->getRequest()));
         $this->crud->unsetValidation(); // validation has already been run
 
         return $this->traitStore();
@@ -116,8 +116,8 @@ public function store()
      */
     public function update()
     {
-        $this->crud->request = $this->crud->validateRequest();
-        $this->crud->request = $this->handlePasswordInput($this->crud->request);
+        $this->crud->setRequest($this->crud->validateRequest());
+        $this->crud->setRequest($this->handlePasswordInput($this->crud->getRequest()));
         $this->crud->unsetValidation(); // validation has already been run
 
         return $this->traitUpdate();

src/config/backpack/permissionmanager.php

@@ -12,7 +12,7 @@
     */
 
     'models' => [
-        'user'       => App\Models\BackpackUser::class,
+        'user'       => App\User::class,
         'permission' => Backpack\PermissionManager\app\Models\Permission::class,
         'role'       => Backpack\PermissionManager\app\Models\Role::class,
     ],

src/database/migrations/2020_03_31_114745_remove_backpackuser_model.php

@@ -0,0 +1,54 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class RemoveBackpackuserModel extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // establish the table names
+        $model_has_roles = config('permission.table_names.model_has_roles');
+        $model_has_permissions = config('permission.table_names.model_has_permissions');
+
+        // replace the BackpackUser model with User
+        if (\Illuminate\Support\Facades\Schema::hasTable($model_has_roles)) {
+            $this->replaceModels($model_has_roles);
+        }
+        if (\Illuminate\Support\Facades\Schema::hasTable($model_has_permissions)) {
+            $this->replaceModels($model_has_permissions);
+        }
+    }
+
+    public function replaceModels($table_name)
+    {
+        Log::info('Replacing BackpackUser model in '.$table_name);
+
+        // if you've ended up with duplicate entries (both for App\User and App\Models\BackpackUser)
+        // we can just delete them
+        $userEntries = DB::table($table_name)
+            ->where('model_type', "App\User")
+            ->get();
+
+        foreach ($userEntries as $entry) {
+            DB::table($table_name)
+                ->where('role_id', $entry->role_id)
+                ->where('model_type', 'App\Models\BackpackUser')
+                ->where('model_id', $entry->model_id)
+                ->delete();
+        }
+
+        // for the rest of them, we can just replace the BackpackUser model with User
+        DB::table($table_name)
+            ->where('model_type', "App\Models\BackpackUser")
+            ->update([
+                'model_type' => "App\User",
+            ]);
+    }
+}