wip #5944 @1

diff --git a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
index d940a59d31044155aa6a0d753eb1cd88f92fcde8..26ac473128eef77027a43bc8a05f26e5be772bf4 100644 (file)
--- a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
@@ -18,6 +18,7 @@ class FluidbookPublicationCrudController extends \Cubist\Backpack\Magic\Controll
        use \App\Http\Controllers\Admin\Operations\ChangeownerOperation;
        use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\SocialImageOperation;
        use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\ExportPdfOperation;
+       use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\BastideOperation;
        
 
 

diff --git a/app/Http/Controllers/Admin/UsersCrudController.php b/app/Http/Controllers/Admin/UsersCrudController.php
index 49a9adb3c60d2bbbbe81fe63f9d374e33fe57056..acb2b97e8765d3665cd282ba7d62501d2ae5f92d 100644 (file)
--- a/app/Http/Controllers/Admin/UsersCrudController.php
+++ b/app/Http/Controllers/Admin/UsersCrudController.php
@@ -19,7 +19,7 @@ class UsersCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagic
        __('utilisateurs')
        */
 
-    protected $_modelNamespace = 'App\Models\AuthUser';
+    protected $_modelNamespace = 'App\Models\User';
     protected $_routeURL = 'users';
     protected $_singular = 'utilisateur';
     protected $_plural = 'utilisateurs';

diff --git a/app/Models/AuthUser.php b/app/Models/AuthUser.php
index 3650fc693ad4c06337722a1c4b195db094aa885a..856b3b2ab4efc215f67d3e34fc58686c92234e67 100644 (file)
--- a/app/Models/AuthUser.php
+++ b/app/Models/AuthUser.php
@@ -2,24 +2,15 @@
 
 namespace App\Models;
 
-use Creativeorange\Gravatar\Facades\Gravatar;
 use Illuminate\Database\Eloquent\Builder;
 
 class AuthUser extends User
 {
     protected $_syncDbSchema = false;
+    protected $_generateController = false;
 
     public static function addOwnerClause(Builder $builder)
     {
 
     }
-
-    public function avatar()
-    {
-
-        $res = Gravatar::get($this->email);
-        return str_replace('.jpg', '', $res);
-    }
-
-
 }

diff --git a/app/Models/User.php b/app/Models/User.php
index baf979eabb3c08de6a8cd9eea6d53c7f72e50d34..a121efc32a8bcd7802f2fe058f33bffa77877511 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Creativeorange\Gravatar\Facades\Gravatar;
 use NotificationChannels\WebPush\HasPushSubscriptions;
 
 class User extends \Cubedesigners\UserDatabase\Models\User
@@ -16,4 +17,10 @@ class User extends \Cubedesigners\UserDatabase\Models\User
         $query->orderBy('id', 'ASC');
 
     }
+
+    public function avatar()
+    {
+        $res = Gravatar::get($this->email);
+        return str_replace('.jpg', '', $res);
+    }
 }