From aeb515278916354d0f92c9d1baf99f701efb4aee Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 16 Oct 2017 09:04:38 -0700 Subject: [PATCH 1/2] Removed extranneous class for danger text --- resources/views/settings/ldap.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index 1543103ec..8b93cf9b3 100644 --- a/resources/views/settings/ldap.blade.php +++ b/resources/views/settings/ldap.blade.php @@ -488,7 +488,6 @@ var error_text; $("#ldaptestloginicon").html(''); - $("#ldaptestloginrow").addClass('danger'); $("#ldaptestloginstatus").addClass('text-danger'); $("#ldaptestloginicon").html(''); From cbe008d52fbf382432f7823fc0ec397aa8255232 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 16 Oct 2017 09:08:08 -0700 Subject: [PATCH 2/2] Fix assetLoc to assetloc because reasons? --- app/Http/Transformers/AssetsTransformer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 92ba702a1..1b53d61aa 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -54,9 +54,9 @@ class AssetsTransformer 'id' => (int) $asset->company->id, 'name'=> e($asset->company->name) ] : null, - 'location' => ($asset->assetLoc) ? [ - 'id' => (int) $asset->assetLoc->id, - 'name'=> e($asset->assetLoc->name) + 'location' => ($asset->assetloc) ? [ + 'id' => (int) $asset->assetloc->id, + 'name'=> e($asset->assetloc->name) ] : null, 'rtd_location' => ($asset->defaultLoc) ? [ 'id' => (int) $asset->defaultLoc->id,