wip #4210 @0.5

diff --git a/app/Jobs/Base.php b/app/Jobs/Base.php
index c2d1b810a46d2ae49217d04529680a98fc20bd54..2a74d8d7a7d4c74ebb81cc46a930e2bf0f958a8f 100644 (file)
--- a/app/Jobs/Base.php
+++ b/app/Jobs/Base.php
@@ -9,22 +9,13 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class Base implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $jobName = 'job';
+class Base extends \Cubist\Backpack\Jobs\Base{
 
     /**
      * @var User
      */
     protected $user;
 
-
-    public function __construct()
-    {
-    }
-
     /**
      * @param User $user
      */
@@ -40,20 +31,4 @@ class Base implements ShouldQueue
     {
         return $this->user;
     }
-
-    /**
-     * @return string
-     */
-    public function getJobName(): string
-    {
-        return $this->jobName;
-    }
-
-    /**
-     * @param string $jobName
-     */
-    public function setJobName(string $jobName): void
-    {
-        $this->jobName = $jobName;
-    }
 }

diff --git a/app/Models/Locale.php b/app/Models/Locale.php
index 5637e0045296608813ab45dae2e89b8ee958f3e0..c9ece0aa4af5a7fe72a3b0f1252bff8b26898e90 100644 (file)
--- a/app/Models/Locale.php
+++ b/app/Models/Locale.php
@@ -7,8 +7,4 @@ use Cubedesigners\UserDatabase\Permissions;
 
 class Locale extends \Cubist\Backpack\Magic\Models\Locale
 {
-    public function preCache($force = false)
-    {
-        parent::preCache($force);
-    }
 }

diff --git a/composer.lock b/composer.lock
index 8a64fa8519033465cf50d193eda62530b31fccb0..86b60162c9a3a5dfe5152dc5a4b35be50b99fd2e 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1512,13 +1512,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "1a1ae5008f0b2031936a494f3631f4442fa1ddb5"
+                "reference": "31757c94df8fae8d5f32e5d7d909fa76744dab9e"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-69f948.tar",
-                "reference": "1a1ae5008f0b2031936a494f3631f4442fa1ddb5",
-                "shasum": "7658317ae707daec32d51e986eaa5aad142e5168"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-d3f8e3.tar",
+                "reference": "31757c94df8fae8d5f32e5d7d909fa76744dab9e",
+                "shasum": "2a7d53360e8f33385dbf8a3d8ec66ee91021b7bc"
             },
             "require": {
                 "cubist/cms-back": "dev-master"
@@ -1550,7 +1550,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2022-05-27T15:58:31+00:00"
+            "time": "2022-06-16T08:37:08+00:00"
         },
         {
             "name": "cubist/azuretts",
@@ -1597,13 +1597,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "a682702d83088c4fabc70ef2e237912fbce6d3e1"
+                "reference": "f3dc797aca2d5e56d427568df2c4fccf0e23958a"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-82cb46.tar",
-                "reference": "a682702d83088c4fabc70ef2e237912fbce6d3e1",
-                "shasum": "242db3f5ebe9929afeb0aef1802d5094d0e7bbd8"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-eff2c0.tar",
+                "reference": "f3dc797aca2d5e56d427568df2c4fccf0e23958a",
+                "shasum": "d8f085f6b3ddfae1cca92776cca8c85b530b5b7b"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1684,7 +1684,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2022-06-16T07:51:24+00:00"
+            "time": "2022-06-16T09:58:27+00:00"
         },
         {
             "name": "cubist/cms-front",