diff --git a/app/config/version.php b/app/config/version.php index d6c7f84878..d1eb74e204 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-145', - 'hash_version' => 'v2.0-145-gba9f003', + 'app_version' => 'v2.0-146', + 'hash_version' => 'v2.0-146-g97d0d78', ); \ No newline at end of file diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index e4ce966c1b..ff3b296247 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -685,8 +685,9 @@ class AssetsController extends AdminController $fixed_filename = str_replace(' ','-',$file->getClientOriginalName()); $file->move($path, date('Y-m-d-his').'-'.$file->getClientOriginalName()); - $name = $file->getClientOriginalName(); - $results[] = compact('name'); + $name = date('Y-m-d-his').'-'.$fixed_filename; + $filesize = Setting::fileSizeConvert(filesize($path.'/'.$name)); + $results[] = compact('name', 'filesize'); } } diff --git a/app/views/backend/hardware/import.blade.php b/app/views/backend/hardware/import.blade.php index 17e44e89bc..61802f0afb 100644 --- a/app/views/backend/hardware/import.blade.php +++ b/app/views/backend/hardware/import.blade.php @@ -41,7 +41,6 @@
| File | Created |
|---|