@php
- $additionalFieldsets = $additionalFieldsets ?? isset($formBuilder) ? $formBuilder->getAdditionalFieldsets() : [];
+ $additionalFieldsets = $additionalFieldsets ?? (isset($formBuilder) ? $formBuilder->getAdditionalFieldsets() : []);
if(!$disableContentFieldset && isset($formBuilder) && $formBuilder->hasFieldsInBaseFieldset()) {
array_unshift($additionalFieldsets, [
'fieldset' => 'content',
diff --git a/views/partials/form/_checkbox.blade.php b/views/partials/form/_checkbox.blade.php
index 43900aeb1..bed540413 100644
--- a/views/partials/form/_checkbox.blade.php
+++ b/views/partials/form/_checkbox.blade.php
@@ -12,7 +12,7 @@
in-store="currentValue"
>
-@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && null === $formFieldsValue = getFormFieldsValue($form_fields, $name)))
+@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && is_null($formFieldsValue = getFormFieldsValue($form_fields, $name))))
@push('vuexStore')
window['{{ config('twill.js_namespace') }}'].STORE.form.fields.push({
name: '{{ $name }}',
diff --git a/views/partials/form/_checkboxes.blade.php b/views/partials/form/_checkboxes.blade.php
index 300b6a705..080007a66 100644
--- a/views/partials/form/_checkboxes.blade.php
+++ b/views/partials/form/_checkboxes.blade.php
@@ -19,7 +19,7 @@
@endif
-@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && null == $formFieldsValue = getFormFieldsValue($form_fields, $name)))
+@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && is_null($formFieldsValue = getFormFieldsValue($form_fields, $name))))
@push('vuexStore')
window['{{ config('twill.js_namespace') }}'].STORE.form.fields.push({
name: '{{ $name }}',
diff --git a/views/partials/form/_color.blade.php b/views/partials/form/_color.blade.php
index cf93981bc..8c664b683 100644
--- a/views/partials/form/_color.blade.php
+++ b/views/partials/form/_color.blade.php
@@ -5,7 +5,7 @@
in-store="value"
>
-@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && null == $formFieldsValue = getFormFieldsValue($form_fields, $name)))
+@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && is_null($formFieldsValue = getFormFieldsValue($form_fields, $name))))
@push('vuexStore')
window['{{ config('twill.js_namespace') }}'].STORE.form.fields.push({
name: '{{ $name }}',
diff --git a/views/partials/form/_date_picker.blade.php b/views/partials/form/_date_picker.blade.php
index 71bd13dc0..826899d59 100644
--- a/views/partials/form/_date_picker.blade.php
+++ b/views/partials/form/_date_picker.blade.php
@@ -19,7 +19,7 @@
in-store="date"
>
-@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && null == $formFieldsValue = getFormFieldsValue($form_fields, $name)))
+@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && is_null($formFieldsValue = getFormFieldsValue($form_fields, $name))))
@push('vuexStore')
window['{{ config('twill.js_namespace') }}'].STORE.form.fields.push({
name: '{{ $name }}',
diff --git a/views/partials/form/_multi_select.blade.php b/views/partials/form/_multi_select.blade.php
index f409ee314..d4b16125f 100644
--- a/views/partials/form/_multi_select.blade.php
+++ b/views/partials/form/_multi_select.blade.php
@@ -45,7 +45,7 @@
@endif
-@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && null == $formFieldsValue = getFormFieldsValue($form_fields, $name)))
+@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && is_null($formFieldsValue = getFormFieldsValue($form_fields, $name))))
@push('vuexStore')
window['{{ config('twill.js_namespace') }}'].STORE.form.fields.push({
name: '{{ $name }}',
diff --git a/views/partials/form/_radios.blade.php b/views/partials/form/_radios.blade.php
index 1cf7bf818..b8880c897 100644
--- a/views/partials/form/_radios.blade.php
+++ b/views/partials/form/_radios.blade.php
@@ -24,7 +24,7 @@
@endif
-@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && null == $formFieldsValue = getFormFieldsValue($form_fields, $name, $default)))
+@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && is_null($formFieldsValue = getFormFieldsValue($form_fields, $name, $default))))
@push('vuexStore')
@include('twill::partials.form.utils._selector_input_store')
@endpush
diff --git a/views/partials/form/_select.blade.php b/views/partials/form/_select.blade.php
index 35919646f..14e1868ed 100644
--- a/views/partials/form/_select.blade.php
+++ b/views/partials/form/_select.blade.php
@@ -77,7 +77,7 @@
@endif
-@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && null == $formFieldsValue = getFormFieldsValue($form_fields, $name)))
+@unless($renderForBlocks || $renderForModal || (!isset($item->$name) && is_null($formFieldsValue = getFormFieldsValue($form_fields, $name))))
@push('vuexStore')
@include('twill::partials.form.utils._selector_input_store')
@endpush
diff --git a/views/partials/form/_select_permissions.blade.php b/views/partials/form/_select_permissions.blade.php
index 1bfbc8d92..a1be42e6f 100644
--- a/views/partials/form/_select_permissions.blade.php
+++ b/views/partials/form/_select_permissions.blade.php
@@ -34,7 +34,7 @@ class="multiselectorPermissions__item"
- @unless((!isset($item->$name) && null == $formFieldsValue = getFormFieldsValue($form_fields, $name)))
+ @unless((!isset($item->$name) && is_null($formFieldsValue = getFormFieldsValue($form_fields, $name))))
@push('vuexStore')
@include('twill::partials.form.utils._selector_input_store')
@endpush
diff --git a/views/users/form.blade.php b/views/users/form.blade.php
index fc5845844..7926b9d1d 100644
--- a/views/users/form.blade.php
+++ b/views/users/form.blade.php
@@ -164,12 +164,12 @@ function($locale) {
:render-for-blocks="false"
:field-values="$item->role_id"
>
- @foreach($permissionModules as $moduleName => $moduleItems)
-
+ @foreach($permissionModules as $permissionModuleName => $moduleItems)
+
@endforeach