From 4ad2ebfcc2de1a5594dbb9205083cdd1027b9a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 24 Feb 2020 16:07:22 +0300 Subject: [PATCH] close #1282 Fixed: Selected value not reflected to select box, causes fatal error after save --- resources/views/partials/form/date_group.blade.php | 2 +- resources/views/partials/form/date_time_group.blade.php | 4 ++-- .../views/partials/form/multi_select_add_new_group.blade.php | 4 ++-- resources/views/partials/form/multi_select_group.blade.php | 4 ++-- resources/views/partials/form/select_add_new_group.blade.php | 4 ++-- resources/views/partials/form/select_group.blade.php | 4 ++-- .../views/partials/form/select_group_add_new_group.blade.php | 4 ++-- resources/views/partials/form/select_group_group.blade.php | 4 ++-- resources/views/partials/form/select_remote_group.blade.php | 4 ++-- resources/views/partials/form/time_group.blade.php | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/views/partials/form/date_group.blade.php b/resources/views/partials/form/date_group.blade.php index 63d487104..988e20d3e 100644 --- a/resources/views/partials/form/date_group.blade.php +++ b/resources/views/partials/form/date_group.blade.php @@ -14,7 +14,7 @@ placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}" name="{{ $name }}" - @if (old($name, $value)) + @if (isset($value) || old($name)) value="{{ old($name, $value) }}" @endif diff --git a/resources/views/partials/form/date_time_group.blade.php b/resources/views/partials/form/date_time_group.blade.php index 33afea947..c8c13da90 100644 --- a/resources/views/partials/form/date_time_group.blade.php +++ b/resources/views/partials/form/date_time_group.blade.php @@ -14,7 +14,7 @@ placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}" name="{{ $name }}" - @if(old($name, $value)) + @if (isset($value) || old($name)) value="{{ old($name, $value) }}" @endif @@ -60,7 +60,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/partials/form/multi_select_add_new_group.blade.php b/resources/views/partials/form/multi_select_add_new_group.blade.php index 2460c6dab..32221d32d 100644 --- a/resources/views/partials/form/multi_select_add_new_group.blade.php +++ b/resources/views/partials/form/multi_select_add_new_group.blade.php @@ -15,7 +15,7 @@ name="{{ $name }}" :options="{{ json_encode($values) }}" - @if(old($name, $selected)) + @if (isset($selected) || old($name)) value="{{ json_encode(old($name, $selected)) }}" @endif @@ -67,7 +67,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/partials/form/multi_select_group.blade.php b/resources/views/partials/form/multi_select_group.blade.php index 8a4ffe1b0..8b766390c 100644 --- a/resources/views/partials/form/multi_select_group.blade.php +++ b/resources/views/partials/form/multi_select_group.blade.php @@ -15,7 +15,7 @@ name="{{ $name }}" :options="{{ json_encode($values) }}" - @if(old($name, $selected)) + @if (isset($selected) || old($name)) value="{{ json_encode(old($name, $selected)) }}" @endif @@ -49,7 +49,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/partials/form/select_add_new_group.blade.php b/resources/views/partials/form/select_add_new_group.blade.php index 84fc4c3ff..aaa5c50c5 100644 --- a/resources/views/partials/form/select_add_new_group.blade.php +++ b/resources/views/partials/form/select_add_new_group.blade.php @@ -15,7 +15,7 @@ name="{{ $name }}" :options="{{ json_encode($values) }}" - @if(old($name, $selected)) + @if (isset($selected) || old($name)) value="{{ old($name, $selected) }}" @endif @@ -61,7 +61,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/partials/form/select_group.blade.php b/resources/views/partials/form/select_group.blade.php index 77cc81062..6744366ce 100644 --- a/resources/views/partials/form/select_group.blade.php +++ b/resources/views/partials/form/select_group.blade.php @@ -15,7 +15,7 @@ name="{{ $name }}" :options="{{ json_encode($values) }}" - @if(old($name, $selected)) + @if (isset($selected) || old($name)) value="{{ old($name, $selected) }}" @endif @@ -43,7 +43,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/partials/form/select_group_add_new_group.blade.php b/resources/views/partials/form/select_group_add_new_group.blade.php index 639298b9b..1f9565354 100644 --- a/resources/views/partials/form/select_group_add_new_group.blade.php +++ b/resources/views/partials/form/select_group_add_new_group.blade.php @@ -15,7 +15,7 @@ name="{{ $name }}" :options="{{ json_encode($values) }}" - @if(old($name, $selected)) + @if (isset($selected) || old($name)) value="{{ old($name, $selected) }}" @endif @@ -63,7 +63,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/partials/form/select_group_group.blade.php b/resources/views/partials/form/select_group_group.blade.php index 2d1775950..4aebae73f 100644 --- a/resources/views/partials/form/select_group_group.blade.php +++ b/resources/views/partials/form/select_group_group.blade.php @@ -15,7 +15,7 @@ name="{{ $name }}" :options="{{ json_encode($values) }}" - @if(old($name, $selected)) + @if (isset($selected) || old($name)) value="{{ old($name, $selected) }}" @endif @@ -45,7 +45,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/partials/form/select_remote_group.blade.php b/resources/views/partials/form/select_remote_group.blade.php index b068be2c3..e151bffc1 100644 --- a/resources/views/partials/form/select_remote_group.blade.php +++ b/resources/views/partials/form/select_remote_group.blade.php @@ -15,7 +15,7 @@ name="{{ $name }}" :options="{{ json_encode($values) }}" - @if(old($name, $selected)) + @if (isset($selected) || old($name)) value="{{ old($name, $selected) }}" @endif @@ -43,7 +43,7 @@ :disabled="'{{ $attributes['disabled'] }}'" @endif - @if(isset($attributes['v-error-message'])) + @if (isset($attributes['v-error-message'])) :form-error="{{ $attributes['v-error-message'] }}" @else :form-error="form.errors.get('{{ $name }}')" diff --git a/resources/views/partials/form/time_group.blade.php b/resources/views/partials/form/time_group.blade.php index 7e25c56dc..db7f6d49e 100644 --- a/resources/views/partials/form/time_group.blade.php +++ b/resources/views/partials/form/time_group.blade.php @@ -14,7 +14,7 @@ placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}" name="{{ $name }}" - @if(old($name, $value)) + @if (isset($value) || old($name)) value="{{ old($name, $value) }}" @endif