From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 24 May 2023 08:36:19 +0000 (+0200)
Subject: wip #5944 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f14eda22f05f21aff376bc59a701c92c201379f8;p=fluidbook-toolbox.git

wip #5944 @1
---

diff --git a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
index d940a59d3..26ac47312 100644
--- 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 49a9adb3c..acb2b97e8 100644
--- 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 3650fc693..856b3b2ab 100644
--- 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 baf979eab..a121efc32 100644
--- 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);
+    }
 }