From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 8 Mar 2022 22:03:45 +0000 (+0100)
Subject: wait #5150
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=8f4d9585709c725a8a081b76666d6ad56c1624f9;p=odl.git

wait #5150
---

diff --git a/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php b/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php
index c62d98a..995e428 100644
--- a/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php
+++ b/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Operations;
 
 
 use App\Models\Asset;
-use Cubist\Util\Files\Files;
 use Cubist\Util\Str;
 use Illuminate\Support\Facades\Route;
 use Prologue\Alerts\Facades\Alert;
@@ -63,6 +62,8 @@ trait ImportAssetsOperation
         } else {
             Alert::success('<b>' . $j . ' fichiers</b> ont été mis à jour')->flash();
         }
+
+        Asset::refreshComposedAttributes();
         return redirect($this->crud->route);
     }
 }
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 4ab4a4e..cacf731 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -3,13 +3,12 @@
 namespace App\Models;
 
 use App\Http\Controllers\Admin\Operations\ImportAssetsOperation;
+use Cubist\Backpack\Magic\Fields\Composed;
 use Cubist\Backpack\Magic\Fields\Datetime;
 use Cubist\Backpack\Magic\Fields\Files;
-use Cubist\Backpack\Magic\Fields\Hidden;
 use Cubist\Backpack\Magic\Fields\Integer;
 use Cubist\Backpack\Magic\Fields\SelectFromArray;
 use Cubist\Backpack\Magic\Fields\SelectFromModel;
-use Cubist\Backpack\Magic\Fields\StaticValue;
 use Cubist\Backpack\Magic\Fields\Tags;
 use Cubist\Backpack\Magic\Fields\Text;
 use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
@@ -37,8 +36,8 @@ class Asset extends CubistMagicAbstractModel
         $this->addField('title', Text::class, 'Titre', ['column' => true]);
         $this->addField('created_at', Datetime::class, 'Ajouté', ['column' => true, 'hidden' => true]);
         $this->addField('updated_at', Datetime::class, 'Mis à jour', ['column' => true, 'hidden' => true]);
-        $this->addField('filesize', Hidden::class, 'Taille des fichiers', ['column' => true, 'column_type' => 'model_function', 'column_function_name' => 'getFilesize']);
-        $this->addField('filemtime', Hidden::class, 'Fichier modifié le', ['column' => true, 'column_type' => 'model_function', 'column_function_name' => 'getFilemtime']);
+        $this->addField('filesize', Composed::class, 'Taille des fichiers', ['column' => true, 'composed' => 'getFilesize']);
+        $this->addField('filemtime', Composed::class, 'Fichier modifié le', ['column' => true, 'composed' => 'getFilemtime']);
         $this->addField('type', SelectFromArray::class, 'Type',
             [
                 'options' =>
@@ -83,7 +82,7 @@ class Asset extends CubistMagicAbstractModel
         if (!$res) {
             return '-';
         }
-        return date('Y-m-d H:i',$res);
+        return date('Y-m-d H:i', $res);
     }
 
     /**
diff --git a/composer.json b/composer.json
index 6562b06..786c80e 100644
--- a/composer.json
+++ b/composer.json
@@ -30,9 +30,7 @@
         "laravel/sanctum": "^v2.14",
         "laravel/tinker": "^v2.7",
         "mxl/laravel-job": "^v1.2",
-        "php-ffmpeg/php-ffmpeg": "^v0.19.0",
-        "predis/predis": "^v1.1",
-        "spatie/laravel-permission": "^4.4"
+        "php-ffmpeg/php-ffmpeg": "^v0.19.0"
     },
     "require-dev": {
         "facade/ignition": "^2.17",
diff --git a/updateodl b/updateodl
index 1532648..7e5ce7a 100644
--- a/updateodl
+++ b/updateodl
@@ -4,6 +4,7 @@ git pull
 composer update
 php artisan cubist:magic:generate
 php artisan cubist:magic:migrate
+php artisan cubist:magic:refreshcomposedattributes
 php artisan optimize:clear
 php artisan permission:cache-reset
 chmod 755 updateodl