diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php index 97b32d1134..c0c26db1cc 100644 --- a/resources/views/models/custom_fields_form_bulk_edit.blade.php +++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php @@ -1,26 +1,24 @@ @php -$fields = []; -$modelNames = []; -foreach($models as $model) { - $modelNames[] = $model->name; -} - + $fields = []; + $modelNames = []; + foreach($models as $model) { + $modelNames[] = $model->name; + } @endphp @foreach($models as $model) - @if (($model) && ($model->fieldset)) - @foreach($model->customFields AS $field) - @php - if (in_array($field->db_column_name(), $fields)) { - $duplicate = true; - continue; - } else { - $duplicate = false; - } - $fields[] = $field->db_column_name(); + @foreach($model->customFields AS $field) + +@php + if (in_array($field->db_column_name(), $fields)) { + $duplicate = true; + continue; + } else { + $duplicate = false; + } + $fields[] = $field->db_column_name(); @endphp -
@@ -29,12 +27,11 @@ foreach($models as $model) { @if ($field->element!='text') @if ($field->element=='listbox') - {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(), + {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(), Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, htmlspecialchars($item->{$field->db_column_name()}, ENT_QUOTES)) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }} @elseif ($field->element=='textarea') - @elseif ($field->element=='checkbox') @foreach ($field->formatFieldValuesAsArray() as $key => $value) @@ -45,32 +42,29 @@ foreach($models as $model) {
@endforeach - - @elseif ($field->element=='radio') - @foreach ($field->formatFieldValuesAsArray() as $value) - + @elseif ($field->element=='radio') + @foreach ($field->formatFieldValuesAsArray() as $value)
- @endforeach + @endforeach - @endif + @endif - - @else + @else - @if ($field->format=='DATE') + @if ($field->format=='DATE') -
-
- - -
-
+
+
+ + +
+
@else @@ -88,11 +82,13 @@ foreach($models as $model) { @endif +

On Models: @foreach($field->assetModels() as $assetModel) @if(in_array($assetModel->name, $modelNames)) -

{{$assetModel->name}}

+ {{$assetModel->name}}{{($loop->last) ? '' : ', '}} @endif @endforeach +