From 5a34d43a86318ee7360cb625c4b2e06ee5a3faeb Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 19 Jul 2018 10:19:55 -0700 Subject: [PATCH 1/2] Fixed #5895 - wrong date validation in maintenances --- app/Models/AssetMaintenance.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php index 83ecd8a17..af05774f1 100644 --- a/app/Models/AssetMaintenance.php +++ b/app/Models/AssetMaintenance.php @@ -29,8 +29,8 @@ class AssetMaintenance extends Model implements ICompanyableChild 'asset_maintenance_type' => 'required', 'title' => 'required|max:100', 'is_warranty' => 'boolean', - 'start_date' => 'required|date_format:"Y-m-d"', - 'completion_date' => 'nullable|date_format:"Y-m-d"', + 'start_date' => 'required|date', + 'completion_date' => 'nullable|date', 'notes' => 'string|nullable', 'cost' => 'numeric|nullable' ]; From a0c0b7b1eb8c32b90479a48d42f9aaa8670afa8b Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 19 Jul 2018 10:22:08 -0700 Subject: [PATCH 2/2] Fixed #5893 - activated typo --- app/Http/Controllers/Auth/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 6090417d4..b114cfc9c 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -76,7 +76,7 @@ class LoginController extends Controller }; 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"); if(!is_null($user)) Auth::login($user, true); } catch(Exception $e) {