cleanup+formatting
This commit is contained in:
parent
3929526a57
commit
d56a4e7173
1 changed files with 31 additions and 35 deletions
|
@ -1,16 +1,15 @@
|
||||||
@php
|
@php
|
||||||
$fields = [];
|
$fields = [];
|
||||||
$modelNames = [];
|
$modelNames = [];
|
||||||
foreach($models as $model) {
|
foreach($models as $model) {
|
||||||
$modelNames[] = $model->name;
|
$modelNames[] = $model->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@endphp
|
@endphp
|
||||||
@foreach($models as $model)
|
@foreach($models as $model)
|
||||||
|
|
||||||
@if (($model) && ($model->fieldset))
|
@if (($model) && ($model->fieldset))
|
||||||
@foreach($model->customFields AS $field)
|
@foreach($model->customFields AS $field)
|
||||||
@php
|
|
||||||
|
@php
|
||||||
if (in_array($field->db_column_name(), $fields)) {
|
if (in_array($field->db_column_name(), $fields)) {
|
||||||
$duplicate = true;
|
$duplicate = true;
|
||||||
continue;
|
continue;
|
||||||
|
@ -20,7 +19,6 @@ foreach($models as $model) {
|
||||||
$fields[] = $field->db_column_name();
|
$fields[] = $field->db_column_name();
|
||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
|
|
||||||
<div class="form-group{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">
|
<div class="form-group{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">
|
||||||
<label for="{{ $field->db_column_name() }}" class="col-md-3 control-label">{{ $field->name }} </label>
|
<label for="{{ $field->db_column_name() }}" class="col-md-3 control-label">{{ $field->name }} </label>
|
||||||
<div class="col-md-7 col-sm-12{{ ($field->pivot->required=='1') ? ' required' : '' }}">
|
<div class="col-md-7 col-sm-12{{ ($field->pivot->required=='1') ? ' required' : '' }}">
|
||||||
|
@ -34,7 +32,6 @@ foreach($models as $model) {
|
||||||
|
|
||||||
@elseif ($field->element=='textarea')
|
@elseif ($field->element=='textarea')
|
||||||
<textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
|
<textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
|
||||||
|
|
||||||
@elseif ($field->element=='checkbox')
|
@elseif ($field->element=='checkbox')
|
||||||
<!-- Checkboxes -->
|
<!-- Checkboxes -->
|
||||||
@foreach ($field->formatFieldValuesAsArray() as $key => $value)
|
@foreach ($field->formatFieldValuesAsArray() as $key => $value)
|
||||||
|
@ -45,10 +42,8 @@ foreach($models as $model) {
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|
||||||
@elseif ($field->element=='radio')
|
@elseif ($field->element=='radio')
|
||||||
@foreach ($field->formatFieldValuesAsArray() as $value)
|
@foreach ($field->formatFieldValuesAsArray() as $value)
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label>
|
<label>
|
||||||
<input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" class="minimal" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
|
<input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" class="minimal" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
|
||||||
|
@ -59,7 +54,6 @@ foreach($models as $model) {
|
||||||
|
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
||||||
@else
|
@else
|
||||||
<!-- Date field -->
|
<!-- Date field -->
|
||||||
|
|
||||||
|
@ -88,11 +82,13 @@ foreach($models as $model) {
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
||||||
|
<p>On Models:
|
||||||
@foreach($field->assetModels() as $assetModel)
|
@foreach($field->assetModels() as $assetModel)
|
||||||
@if(in_array($assetModel->name, $modelNames))
|
@if(in_array($assetModel->name, $modelNames))
|
||||||
<p>{{$assetModel->name}}</p>
|
{{$assetModel->name}}{{($loop->last) ? '' : ', '}}
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue