Merge remote-tracking branch 'origin/develop'
This commit is contained in:
@@ -368,10 +368,10 @@
|
||||
|
||||
// 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 @@
|
||||
'licenses',
|
||||
'locations',
|
||||
'maintenances',
|
||||
'maintenances',
|
||||
'manufacturers',
|
||||
'models',
|
||||
'statuslabels',
|
||||
|
||||
Reference in New Issue
Block a user