wip #5052 @0.25

diff --git a/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php b/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php
index 60ffdf3d55585a97e09583e2b0fafd9a8a4c0c50..93947e7e2ea1cc0aa74f81e102dab7c44b8ba864 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php
+++ b/app/Http/Controllers/Admin/Operations/ImportAssetsOperation.php
@@ -52,7 +52,6 @@ trait ImportAssetsOperation
                 continue;
             }
             $asset->replaceMediaInField('file_upload', $file);
-
             $j++;
         }
 

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 2cb326f7fe50e120fce95506db5c7aa1f71ad8de..12ac7a0b0db8432634ba21d9c27bbbe085f5441f 100644 (file)
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -61,7 +61,9 @@ class Asset extends CubistMagicAbstractModel
         $res = 0;
         foreach ($this->getMediaInField($this->getAttributeValue('file_upload')) as $item) {
             /** @var $item Media */
-            $res += filesize($item->getPath());
+            if (file_exists($item->getPath())) {
+                $res += filesize($item->getPath());
+            }
         }
         return $res;
     }