mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-30 04:14:17 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #5944 - added logo option for print-assets page (#5950)

Browse Source
This commit is contained in:
snipe
2018-07-24 13:37:02 -07:00
committed by GitHub
parent ed78a4b8a0
commit e320d2ba05
6 changed files with 82 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,11 +169,7 @@ class SettingsController extends Controller
$settings->alerts_enabled = 1;
$settings->pwd_secure_min = 10;
$settings->brand = 1;
if (!config('app.lock_passwords')) {
$settings->locale = $request->input('locale', 'en');
}
$settings->locale = $request->input('locale', 'en');
$settings->default_currency = $request->input('default_currency', "USD");
$settings->user_id = 1;
$settings->email_domain = $request->input('email_domain');
@ -405,6 +401,8 @@ class SettingsController extends Controller
$setting->footer_text = $request->input('footer_text');
$setting->skin = $request->input('skin');
$setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
$setting->logo_print_assets = $request->input('logo_print_assets', '0');
// Only allow the site name and CSS to be changed if lock_passwords is false
@ -541,7 +539,9 @@ class SettingsController extends Controller
return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
}
$setting->locale = $request->input('locale', 'en');
if (!config('app.lock_passwords')) {
$setting->locale = $request->input('locale', 'en');
}
$setting->default_currency = $request->input('default_currency', '$');
$setting->date_display_format = $request->input('date_display_format');
$setting->time_display_format = $request->input('time_display_format');