Merge pull request #1236 from rahulshukla-webkul/development

issue #1235
This commit is contained in:
Jitendra Singh 2019-07-31 19:21:09 +05:30 committed by GitHub
commit 1403f93e79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -143,7 +143,7 @@
<select class="control" name="attributes[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.catalog.categories.attributes') }}&quot;" multiple>
@foreach ($attributes as $attribute)
<option value="{{ $attribute->id }}">
{{ $attribute->name }}
{{ $attribute->name ? $attribute->name : $attribute->admin_name }}
</option>
@endforeach
</select>

View File

@ -155,7 +155,7 @@
<select class="control" name="attributes[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.catalog.categories.attributes') }}&quot;" multiple>
@foreach ($attributes as $attribute)
<option value="{{ $attribute->id }}" {{ in_array($attribute->id, $category->filterableAttributes->pluck('id')->toArray()) ? 'selected' : ''}}>
{{ $attribute->name }}
{{ $attribute->name ? $attribute->name : $attribute->admin_name }}
</option>
@endforeach
</select>