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 branch 'develop'

Browse source
This commit is contained in:
snipe 2018-07-19 10:23:18 -07:00
parent 86a0f77e6f a0c0b7b1eb
commit 53fab3e9ba
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,7 +76,7 @@ class LoginController extends Controller
}; };
try { try {
$user = User::where('username', '=', $remote_user)->whereNull('deleted_at')->where('active', '=', '1')->first(); $user = User::where('username', '=', $remote_user)->whereNull('deleted_at')->where('activated', '=', '1')->first();
LOG::debug("Remote user auth lookup complete"); LOG::debug("Remote user auth lookup complete");
if(!is_null($user)) Auth::login($user, true); if(!is_null($user)) Auth::login($user, true);
} catch(Exception $e) { } catch(Exception $e) {

4
app/Models/AssetMaintenance.php
View file

@ -29,8 +29,8 @@ class AssetMaintenance extends Model implements ICompanyableChild
'asset_maintenance_type' => 'required', 'asset_maintenance_type' => 'required',
'title' => 'required|max:100', 'title' => 'required|max:100',
'is_warranty' => 'boolean', 'is_warranty' => 'boolean',
'start_date' => 'required|date_format:"Y-m-d"', 'start_date' => 'required|date',
'completion_date' => 'nullable|date_format:"Y-m-d"', 'completion_date' => 'nullable|date',
'notes' => 'string|nullable', 'notes' => 'string|nullable',
'cost' => 'numeric|nullable' 'cost' => 'numeric|nullable'
]; ];