mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-07 03:47:32 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
3ea0cd75a5
|
@ -73,9 +73,11 @@ class LabelsController extends Controller
|
||||||
->each(function ($item) use ($customFieldColumns, $exampleAsset) {
|
->each(function ($item) use ($customFieldColumns, $exampleAsset) {
|
||||||
$pair = explode('=', $item);
|
$pair = explode('=', $item);
|
||||||
|
|
||||||
|
if (array_key_exists(1, $pair)) {
|
||||||
if ($customFieldColumns->contains($pair[1])) {
|
if ($customFieldColumns->contains($pair[1])) {
|
||||||
$exampleAsset->{$pair[1]} = "{{$pair[0]}}";
|
$exampleAsset->{$pair[1]} = "{{$pair[0]}}";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$settings = Setting::getSettings();
|
$settings = Setting::getSettings();
|
||||||
|
|
Loading…
Reference in a new issue