mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-07 14:05:41 +00:00
Code Issues Projects Releases Wiki Activity

Allow date/time formatting selection in settings

Browse Source
This commit is contained in:
snipe
2017-03-03 17:29:41 -08:00
parent 161bd7acce
commit dc38e575d9
12 changed files with 187 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/SettingsController.php
View File

@ -306,7 +306,6 @@ class SettingsController extends Controller
if (!config('app.lock_passwords')) {
$setting->site_name = e(Input::get('site_name'));
$setting->custom_css = e(Input::get('custom_css'));
if (Input::get('two_factor_enabled')=='') {
@ -341,8 +340,6 @@ class SettingsController extends Controller
$setting->email_format = e(Input::get('email_format'));
$setting->username_format = e(Input::get('username_format'));
$setting->require_accept_signature = e(Input::get('require_accept_signature'));
$setting->labels_per_page = e(Input::get('labels_per_page'));
$setting->labels_width = e(Input::get('labels_width'));
$setting->labels_height = e(Input::get('labels_height'));
@ -407,6 +404,9 @@ class SettingsController extends Controller
$setting->ldap_tls = e(Input::get('ldap_tls', '0'));
$setting->ldap_pw_sync = e(Input::get('ldap_pw_sync', '0'));
$setting->date_display_format = e(Input::get('date_display_format'));
$setting->time_display_format = e(Input::get('time_display_format'));
if ($request->input('clear_logo')=='1') {
$setting->logo = null;