DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2021-03-24 11:35:39 -07:00
parent c90604b5ae 0114373468
commit 0b41f9182a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Auth/LoginController.php
View file

@ -111,7 +111,7 @@ class LoginController extends Controller
Auth::login($user, true); Auth::login($user, true);
} else { } else {
$username = $saml->getUsername(); $username = $saml->getUsername();
Log::error("SAML user '$username' could not be found in database."); \Log::warning("SAML user '$username' could not be found in database.");
$request->session()->flash('error', trans('auth/message.signin.error')); $request->session()->flash('error', trans('auth/message.signin.error'));
$saml->clearData(); $saml->clearData();
} }
@ -121,7 +121,7 @@ class LoginController extends Controller
$user->save(); $user->save();
} }
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error("There was an error authenticating the SAML user: " . $e->getMessage()); \Log::warning("There was an error authenticating the SAML user: " . $e->getMessage());
throw new \Exception($e->getMessage()); throw new \Exception($e->getMessage());
} }
} }

2
app/Models/Company.php
View file

@ -78,7 +78,7 @@ final class Company extends SnipeModel
$company_id = null; $company_id = null;
} }
$table = ($table_name) ? DB::getTablePrefix().$table_name."." : ''; $table = ($table_name) ? $table_name."." : '';
if(\Schema::hasColumn($query->getModel()->getTable(), $column)){ if(\Schema::hasColumn($query->getModel()->getTable(), $column)){
return $query->where($table.$column, '=', $company_id); return $query->where($table.$column, '=', $company_id);