mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-13 06:47:46 -08:00
Show the date and time as the user select in their settings
This commit is contained in:
parent
91c7a89f93
commit
72493d54aa
|
@ -1044,7 +1044,7 @@ class SettingsController extends Controller
|
||||||
*/
|
*/
|
||||||
public function getBackups()
|
public function getBackups()
|
||||||
{
|
{
|
||||||
|
$settings = Setting::getSettings();
|
||||||
$path = 'app/backups';
|
$path = 'app/backups';
|
||||||
$backup_files = Storage::files($path);
|
$backup_files = Storage::files($path);
|
||||||
$files_raw = [];
|
$files_raw = [];
|
||||||
|
@ -1061,7 +1061,7 @@ class SettingsController extends Controller
|
||||||
'filename' => basename($backup_files[$f]),
|
'filename' => basename($backup_files[$f]),
|
||||||
'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])),
|
'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])),
|
||||||
'modified_value' => $file_timestamp,
|
'modified_value' => $file_timestamp,
|
||||||
'modified_display' => date("M d, Y g:i A", $file_timestamp),
|
'modified_display' => date($settings->date_display_format.' '.$settings->time_display_format, $file_timestamp),
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue