wip #3711 @1

diff --git a/app/Fields/User.php b/app/Fields/User.php
new file mode 100644 (file)
index 0000000..ef9eef6
--- /dev/null
+++ b/app/Fields/User.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace App\Fields;
+
+
+class User extends \Cubist\Backpack\app\Magic\Fields\User
+{
+
+}

diff --git a/app/Http/Controllers/Admin/Base/QuizController.php b/app/Http/Controllers/Admin/Base/QuizController.php
index 294a044e9c9d188a761dc631f626dddebaa2b0a5..324056b4f8418c2085c7016c24228b5f465968f0 100644 (file)
--- a/app/Http/Controllers/Admin/Base/QuizController.php
+++ b/app/Http/Controllers/Admin/Base/QuizController.php
@@ -16,9 +16,7 @@ class QuizController extends CubistMagicController
 
     function setupListOperation()
     {
-        if (!can('viewany')) {
-            $this->crud->addClause('where', 'owner', '=', auth()->user()->id);
-        }
+        $this->crud->addClause('whereIn', 'owner', auth()->user()->getManagedUsers());
     }
 
 }

diff --git a/app/Models/Company.php b/app/Models/Company.php
index cf646db4b94536dbd58c036a6ae8d6813e05cd32..b2d07b0f7ac8baed60cbb3155dd686689e8a7945 100644 (file)
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -1,4 +1,4 @@
 <?php
-class Company extends \Cubedesigners\Userdatabase\Company{
+class Company extends \Cubedesigners\UserDatabase\Company{
     protected $_syncDbSchema=false;
 }

diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index 948fe13465c49bec8cff5ba52ca3d12ccc3f1e8b..84008206c26f61f83811a0121fe4dad2e8d72970 100644 (file)
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -9,6 +9,7 @@ use Cubist\Util\Files\Files;
 use Cubist\Util\Zip;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Spatie\Image\Manipulations;
+use App\Fields\User;
 
 class Quiz extends CubistMagicAbstractModel
 {
@@ -77,9 +78,10 @@ class Quiz extends CubistMagicAbstractModel
 
         $this->addField(['name' => 'owner',
             'label' => 'Owner',
-            'type' => 'User',
+            'type' => User::class,
             'column' => true,
-            'can' => 'viewany',
+            'can' => 'toolbox:quiz:edit_ownership',
+            'attribute'=>'companyWithName',
             'tab' => 'Project']);
 
         $this->addField(['name' => 'title',

diff --git a/app/Models/User.php b/app/Models/User.php
index 82d65e9be907ff09c8ee942c092db751aa9bc1f3..c51b446c38e72776b26f7309facbb0c927666229 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class User extends \Cubedesigners\Userdatabase\User
+class User extends \Cubedesigners\UserDatabase\User
 {
     protected $_syncDbSchema=false;
 }

diff --git a/composer.lock b/composer.lock
index 387a9f77877622738df6138bba7a1a5a1ca7aac4..300cd4b839bc894beb7dfaf2f9d7af3bfa2d20f8 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -71,16 +71,16 @@
         },
         {
             "name": "backpack/crud",
-            "version": "4.1.8",
+            "version": "4.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Laravel-Backpack/CRUD.git",
-                "reference": "393a054490c97721186deb9faed20c6ed70ef6ef"
+                "reference": "849623e7bf499c3f206c19a80146d01f27e2cd0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/393a054490c97721186deb9faed20c6ed70ef6ef",
-                "reference": "393a054490c97721186deb9faed20c6ed70ef6ef",
+                "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/849623e7bf499c3f206c19a80146d01f27e2cd0d",
+                "reference": "849623e7bf499c3f206c19a80146d01f27e2cd0d",
                 "shasum": ""
             },
             "require": {
@@ -151,7 +151,7 @@
                 "read",
                 "update"
             ],
-            "time": "2020-06-06T05:34:09+00:00"
+            "time": "2020-06-16T08:06:55+00:00"
         },
         {
             "name": "backpack/logmanager",
@@ -1070,13 +1070,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "15643e94b45f7fb59ca840d97e8b80db0e760dc8"
+                "reference": "0f19fb402f186aa54fc9572389618f7c597d35e1"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-3442d1.tar",
-                "reference": "15643e94b45f7fb59ca840d97e8b80db0e760dc8",
-                "shasum": "39671c0dfd70aa5e4b7a7748b4ff4d99db20cc1a"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-47bb90.tar",
+                "reference": "0f19fb402f186aa54fc9572389618f7c597d35e1",
+                "shasum": "3edfa8cf909727ea74f7c2ab239af468a0a312a8"
             },
             "require": {
                 "cubist/cms-back": "dev-master"
@@ -1084,7 +1084,7 @@
             "type": "library",
             "autoload": {
                 "psr-0": {
-                    "Cubedesigners\\Userdatabase\\": "src"
+                    "Cubedesigners\\UserDatabase\\": "src"
                 }
             },
             "license": [
@@ -1097,7 +1097,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2020-06-15T16:56:29+00:00"
+            "time": "2020-06-16T13:28:04+00:00"
         },
         {
             "name": "cubist/cms-back",
@@ -7218,16 +7218,16 @@
         },
         {
             "name": "voku/portable-ascii",
-            "version": "1.5.1",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "e7f9bd5deff09a57318f9b900ab33a05acfcf4d3"
+                "reference": "618631dc601d8eb6ea0a9fbf654ec82f066c4e97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/e7f9bd5deff09a57318f9b900ab33a05acfcf4d3",
-                "reference": "e7f9bd5deff09a57318f9b900ab33a05acfcf4d3",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/618631dc601d8eb6ea0a9fbf654ec82f066c4e97",
+                "reference": "618631dc601d8eb6ea0a9fbf654ec82f066c4e97",
                 "shasum": ""
             },
             "require": {
@@ -7262,7 +7262,7 @@
                 "clean",
                 "php"
             ],
-            "time": "2020-05-26T06:40:44+00:00"
+            "time": "2020-06-15T23:49:30+00:00"
         }
     ],
     "packages-dev": [
@@ -10062,16 +10062,16 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+                "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
+                "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
                 "shasum": ""
             },
             "require": {
@@ -10079,6 +10079,7 @@
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
+                "phpstan/phpstan": "<0.12.20",
                 "vimeo/psalm": "<3.9.1"
             },
             "require-dev": {
@@ -10106,7 +10107,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-04-18T12:12:48+00:00"
+            "time": "2020-06-16T10:16:42+00:00"
         }
     ],
     "aliases": [],

diff --git a/resources/views/vendor/backpack/base/dashboard.blade.php b/resources/views/vendor/backpack/base/dashboard.blade.php
index 878832af9755513365d6b3d7f3b5796f4fc264a5..efae3790226a4f25420d6db8dcc413fe86c1db7b 100644 (file)
--- a/resources/views/vendor/backpack/base/dashboard.blade.php
+++ b/resources/views/vendor/backpack/base/dashboard.blade.php
@@ -8,22 +8,21 @@
         'button_link' => backpack_url('logout'),
         'button_text' => trans('backpack::base.logout'),
     ];
-
 @endphp
 @section('content')
-    <div class="row">
-        <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <div class="box-title">{{ trans('backpack::base.login_status') }}</div>
-                </div>
+{{--    <div class="row">--}}
+{{--        <div class="col-md-12">--}}
+{{--            <div class="box">--}}
+{{--                <div class="box-header with-border">--}}
+{{--                    <div class="box-title">{{ trans('backpack::base.login_status') }}</div>--}}
+{{--                </div>--}}
 
-                <div class="box-body">{{ trans('backpack::base.logged_in') }}</div>
-                <div class="box-body">
-                    Permissions: {{ backpack_user()->getAllPermissions()}}</div>
-                <div class="box-body">Roles: {{ backpack_user()->getRoleNames()->implode('name',', ') }}</div>
-            </div>
-        </div>
-    </div>
+{{--                <div class="box-body">{{ trans('backpack::base.logged_in') }}</div>--}}
+{{--                <div class="box-body">--}}
+{{--                    Permissions: {{ backpack_user()->getAllPermissions()}}</div>--}}
+{{--                <div class="box-body">Roles: {{ backpack_user()->getRoleNames()->implode('name',', ') }}</div>--}}
+{{--            </div>--}}
+{{--        </div>--}}
+{{--    </div>--}}
 @endsection
 

diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
index b35a47f42cf0c7695aed159726b05d3196356dd7..60fd0f0fcb34b72abee68075fdeeea740a370e2a 100644 (file)
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -32,6 +32,6 @@
     </li>
 @endcan
 @can('toolbox:manageusers')
-    <li class="nav-item"><a class="nav-link" href="https://dev.extranet.cubedesigners.com/user"><i
+    <li class="nav-item"><a class="nav-link" target="extranet" href="https://dev.extranet.cubedesigners.com/users"><i
                 class="fa fa-lock nav-icon"></i>Authentication</a></li>
 @endcan