DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-07 03:47:32 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-16 09:09:53 -07:00
parent 938490df16 cbe008d52f
commit 10a4d7e849
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Transformers/AssetsTransformer.php
View file

@ -54,9 +54,9 @@ class AssetsTransformer
'id' => (int) $asset->company->id, 'id' => (int) $asset->company->id,
'name'=> e($asset->company->name) 'name'=> e($asset->company->name)
] : null, ] : null,
'location' => ($asset->assetLoc) ? [ 'location' => ($asset->assetloc) ? [
'id' => (int) $asset->assetLoc->id, 'id' => (int) $asset->assetloc->id,
'name'=> e($asset->assetLoc->name) 'name'=> e($asset->assetloc->name)
] : null, ] : null,
'rtd_location' => ($asset->defaultLoc) ? [ 'rtd_location' => ($asset->defaultLoc) ? [
'id' => (int) $asset->defaultLoc->id, 'id' => (int) $asset->defaultLoc->id,

1
resources/views/settings/ldap.blade.php
View file

@ -488,7 +488,6 @@
var error_text; var error_text;
$("#ldaptestloginicon").html(''); $("#ldaptestloginicon").html('');
$("#ldaptestloginrow").addClass('danger');
$("#ldaptestloginstatus").addClass('text-danger'); $("#ldaptestloginstatus").addClass('text-danger');
$("#ldaptestloginicon").html('<i class="fa fa-exclamation-triangle text-danger"></i>'); $("#ldaptestloginicon").html('<i class="fa fa-exclamation-triangle text-danger"></i>');