Merge remote-tracking branch 'origin/develop'

Author: snipe

resources/views/partials/bootstrap-table.blade.php

@@ -368,10 +368,10 @@ function genericColumnObjLinkFormatter(destination) {
 
                 // Add some overrides for any funny urls we have
                 var dest = destination;
-                var polymorphicItemFormatterDest;
-                if (destination=='fieldsets') {
+                var polymorphicItemFormatterDest = '';
+                if (destination == 'fieldsets') {
                     var polymorphicItemFormatterDest = 'fields/';
-                }
+                } 
 
                 return '<nobr><a href="{{ config('app.url') }}/' + polymorphicItemFormatterDest + dest + '/' + value.id + '">' + value.name + '</a></span>';
             }
@@ -633,7 +633,6 @@ function assetRequestActionsFormatter (row, value) {
         'licenses',
         'locations',
         'maintenances',
-        'maintenances',
         'manufacturers',
         'models',
         'statuslabels',