DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2020-09-15 10:15:17 -07:00
parent e464f0edf3 cfd78fa870
commit 4d6a8d48ee
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,7 +186,7 @@ class SettingsController extends Controller
Auth::login($user, true); Auth::login($user, true);
$settings->save(); $settings->save();
if ('1' == get('email_creds')) { if ($request->input('email_creds') == '1') {
$data = []; $data = [];
$data['email'] = $user->email; $data['email'] = $user->email;
$data['username'] = $user->username; $data['username'] = $user->username;
@ -347,7 +347,7 @@ class SettingsController extends Controller
$setting->depreciation_method = $request->input('depreciation_method'); $setting->depreciation_method = $request->input('depreciation_method');
if ('' != get('per_page')) { if ($request->input('per_page') != '') {
$setting->per_page = $request->input('per_page'); $setting->per_page = $request->input('per_page');
} else { } else {
$setting->per_page = 200; $setting->per_page = 200;
@ -1149,7 +1149,7 @@ class SettingsController extends Controller
public function postPurge(Request $request) public function postPurge(Request $request)
{ {
if (! config('app.lock_passwords')) { if (! config('app.lock_passwords')) {
if ('DELETE' == $request->get('confirm_purge')) { if ('DELETE' == $request->input('confirm_purge')) {
// Run a backup immediately before processing // Run a backup immediately before processing
Artisan::call('backup:run'); Artisan::call('backup:run');
Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]); Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);