From: Vincent Vanwaelscappel Date: Mon, 15 Jan 2024 18:56:19 +0000 (+0100) Subject: wait #6629 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c6e4052eb694597fd3bfde0c7fc36bd914e59d59;p=fluidbook-toolbox.git wait #6629 @0.25 --- diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index 026748001..eaebdbfbb 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -237,7 +237,15 @@ class FluidbookPublication extends ToolboxStatusModel $this->setSettingsFields(); $this->addField('section_infos', FormBigSection::class, __('Administration')); - $this->addField('visits_counter', Integer::class, 'Compteur de visites', ['read_only' => true, 'default' => 0, 'column' => true, 'column_label' => '', 'searchLogic' => false]); + $this->addField('visits_counter', Integer::class, 'Compteur de visites', + [ + 'read_only' => true, + 'default' => 0, + 'column' => true, + 'column_label' => '', + 'searchLogic' => false, + 'can' => 'fluidbook-publication:admin', + ]); $this->addField(self::CREATED_AT, Datetime::class, __('Crée'), ['column' => true, 'column_type' => 'datetime', 'column_format' => 'YYYY-MM-DD', 'filter' => true, 'read_only' => true, 'searchLogic' => false]); $this->addField(self::UPDATED_AT, Datetime::class, __('Mis à jour'), ['column' => true, 'column_format' => 'YYYY-MM-DD', 'filter' => true, 'read_only' => true, 'searchLogic' => false]); @@ -729,7 +737,7 @@ class FluidbookPublication extends ToolboxStatusModel public function allowsAudit() { - return $this->allowsUpdate(); + return can(static::$_permissionBase . ':admin') && $this->allowsUpdate(); } diff --git a/composer.lock b/composer.lock index 260f5bdb8..498b11a05 100644 --- a/composer.lock +++ b/composer.lock @@ -949,67 +949,6 @@ }, "time": "2021-12-31T10:03:23+00:00" }, - { - "name": "calebporzio/parental", - "version": "v1.3.6", - "source": { - "type": "git", - "url": "https://github.com/tighten/parental.git", - "reference": "2f41ac4a8ac755ad4165f35823bf3f4782e11dba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tighten/parental/zipball/2f41ac4a8ac755ad4165f35823bf3f4782e11dba", - "reference": "2f41ac4a8ac755ad4165f35823bf3f4782e11dba", - "shasum": "" - }, - "require": { - "illuminate/database": "^9.0||^10.0", - "illuminate/events": "^9.0||^10.0", - "php": "^8.0" - }, - "require-dev": { - "orchestra/testbench": "^7.0||^8.0", - "phpunit/phpunit": "^9.5.10||^10.0", - "tightenco/duster": "^2.7" - }, - "type": "library", - "autoload": { - "psr-4": { - "Parental\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Caleb Porzio", - "email": "calebporzio@gmail.com", - "homepage": "https://calebporzio.com/", - "role": "author" - }, - { - "name": "Steve McDougall", - "email": "juststevemcd@gmail.com", - "homepage": "https://www.juststeveking.uk/", - "role": "developer" - } - ], - "description": "A simple eloquent trait that allows relationships to be accessed through child models.", - "support": { - "issues": "https://github.com/tighten/parental/issues", - "source": "https://github.com/tighten/parental/tree/v1.3.6" - }, - "funding": [ - { - "url": "https://github.com/calebporzio", - "type": "github" - } - ], - "time": "2024-01-12T20:37:58+00:00" - }, { "name": "carbonphp/carbon-doctrine-types", "version": "2.1.0", @@ -1738,13 +1677,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "4b4697d5f6f5d1502aa7b52b18dbd700a412a472" + "reference": "56509efd3b620e928ed14f3d722802c1027e4b09" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-c9ccf3.tar", - "reference": "4b4697d5f6f5d1502aa7b52b18dbd700a412a472", - "shasum": "be874cdaae31a7088ca0dc54c5854bb3c3b52a66" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-4fcd03.tar", + "reference": "56509efd3b620e928ed14f3d722802c1027e4b09", + "shasum": "80c966f4ce25af613b9b89bc5926e9f1689420fe" }, "require": { "backpack/backupmanager": "^v3.0.9", @@ -1755,7 +1694,6 @@ "backpack/revise-operation": "^1.0.12", "barryvdh/laravel-debugbar": "^v3.9.2", "cache/redis-adapter": "^1.2.0", - "calebporzio/parental": "^v1.3.3", "chrisjean/php-ico": "^1.0.4", "cubist/cms-front": "dev-backpack5", "cubist/laravel-backpack-dropzone-field": "dev-master", @@ -1771,7 +1709,7 @@ "graham-campbell/markdown": "^v15.1.0", "laravel-lang/lang": "12.19.4", "laravel-lang/publisher": "^v14.7.4", - "laravel/framework": "^v10.33.0", + "laravel/framework": "^v10.40.0", "lavary/laravel-menu": "^v1.8.3", "league/commonmark": "^2.4.0", "mews/purifier": "^3.4", @@ -1823,7 +1761,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2024-01-10T10:53:14+00:00" + "time": "2024-01-15T18:38:35+00:00" }, { "name": "cubist/cms-front", @@ -2248,13 +2186,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "c3bad8097f7990693cc347f7e6265e5388e8cd81" + "reference": "f15e99193c36a9b70d5a0cf523d8ff42680e9abb" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-905264.tar", - "reference": "c3bad8097f7990693cc347f7e6265e5388e8cd81", - "shasum": "f8d7e410a3aa697cb259a48ce597bd9ab70eed59" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-cbad04.tar", + "reference": "f15e99193c36a9b70d5a0cf523d8ff42680e9abb", + "shasum": "cdabb1faca8a0d49608d95c70a7a5210dfaac2f7" }, "require": { "cubist/net": "dev-master", @@ -2288,7 +2226,7 @@ } ], "description": "Utilities class", - "time": "2024-01-05T16:41:31+00:00" + "time": "2024-01-15T16:33:50+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -3030,16 +2968,16 @@ }, { "name": "doctrine/inflector", - "version": "2.0.8", + "version": "2.0.9", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff" + "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff", - "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", + "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65", "shasum": "" }, "require": { @@ -3101,7 +3039,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.8" + "source": "https://github.com/doctrine/inflector/tree/2.0.9" }, "funding": [ { @@ -3117,7 +3055,7 @@ "type": "tidelift" } ], - "time": "2023-06-16T13:40:37+00:00" + "time": "2024-01-15T18:05:13+00:00" }, { "name": "doctrine/lexer",