Merge pull request #11752 from dsferruzza/fixes/s3-file-size

Fixed #11742: display correct file sizes when using S3(-like) storage
snipe · Aug 29, 2022 · 3527902 · 3527902
2 parents 96ec96f + f60ea95
commit 3527902
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
@@ -1184,8 +1184,8 @@ class="table table-striped snipe-table"
                                                 <td>
                                                     {{ $file->filename }}
                                                 </td>
-                                                <td data-value="{{ @filesize(storage_path('private_uploads/assets/').$file->filename) }}">
-                                                    {{ @Helper::formatFilesizeUnits(filesize(storage_path('private_uploads/assets/').$file->filename)) }}
+                                                <td data-value="{{ @Storage::size('private_uploads/assets/'.$file->filename) }}">
+                                                    {{ @Helper::formatFilesizeUnits(Storage::size('private_uploads/assets/'.$file->filename)) }}
                                                 </td>
                                                 <td>
                                                     @if ($file->note)
@@ -1277,8 +1277,8 @@ class="table table-striped snipe-table"
                                                 <td>
                                                     {{ $file->filename }}
                                                 </td>
-                                                <td data-value="{{ filesize(storage_path('private_uploads/assetmodels/').$file->filename) }}">
-                                                    {{ Helper::formatFilesizeUnits(filesize(storage_path('private_uploads/assetmodels/').$file->filename)) }}
+                                                <td data-value="{{ Storage::size('private_uploads/assetmodels/'.$file->filename) }}">
+                                                    {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) }}
                                                 </td>
                                                 <td>
                                                     @if ($file->note)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
@@ -469,8 +469,8 @@ class="table table-striped snipe-table"
                 <td>
                   {{ $file->filename }}
                 </td>
-                <td data-value="{{ filesize(storage_path('private_uploads/licenses/').$file->filename) }}">
-                  {{ Helper::formatFilesizeUnits(filesize(storage_path('private_uploads/licenses/').$file->filename)) }}
+                <td data-value="{{ Storage::size('private_uploads/licenses/'.$file->filename) }}">
+                  {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/licenses/'.$file->filename)) }}
                 </td>
 
                 <td>

diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
@@ -154,8 +154,8 @@ class="table table-striped snipe-table"
                                             <td>
                                                 {{ $file->filename }}
                                             </td>
-                                            <td data-value="{{ filesize(storage_path('private_uploads/assetmodels/').$file->filename) }}">
-                                                {{ Helper::formatFilesizeUnits(filesize(storage_path('private_uploads/assetmodels/').$file->filename)) }}
+                                            <td data-value="{{ Storage::size('private_uploads/assetmodels/'.$file->filename) }}">
+                                                {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) }}
                                             </td>
                                             <td>
                                                 @if ($file->note)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
@@ -842,7 +842,7 @@ class="table table-striped snipe-table"
                                 {{ $file->filename }}
                             </td>
                             <td>
-                                {{ Helper::formatFilesizeUnits(filesize(storage_path('private_uploads/users/').$file->filename)) }}
+                                {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/users/'.$file->filename)) }}
                             </td>
 
                             <td>