@php
- $additionalFieldsets = $additionalFieldsets ?? isset($formBuilder) ? $formBuilder->getAdditionalFieldsets() : [];
+ $additionalFieldsets = $additionalFieldsets ?? (isset($formBuilder) ? $formBuilder->getAdditionalFieldsets() : []);
if(!$disableContentFieldset && isset($formBuilder) && $formBuilder->hasFieldsInBaseFieldset()) {
array_unshift($additionalFieldsets, [
'fieldset' => 'content',
@@ -205,9 +205,9 @@
window['{{ config('twill.js_namespace') }}'].STORE.parents = {!! json_encode($parents ?? []) !!}
@if (isset($item) && classHasTrait($item, \A17\Twill\Models\Behaviors\HasMedias::class))
- window['{{ config('twill.js_namespace') }}'].STORE.medias.crops = {!! json_encode(($item->getMediasParams()) + \A17\Twill\Facades\TwillBlocks::getAllCropConfigs() + (config('twill.settings.crops') ?? [])) !!}
+ window['{{ config('twill.js_namespace') }}'].STORE.medias.crops = {!! json_encode(($item->getMediasParams()) + \A17\Twill\Facades\TwillBlocks::getAllCropConfigs(true) + (config('twill.settings.crops') ?? [])) !!}
@else
- window['{{ config('twill.js_namespace') }}'].STORE.medias.crops = {!! json_encode(\A17\Twill\Facades\TwillBlocks::getAllCropConfigs() + (config('twill.settings.crops') ?? [])) !!}
+ window['{{ config('twill.js_namespace') }}'].STORE.medias.crops = {!! json_encode(\A17\Twill\Facades\TwillBlocks::getAllCropConfigs(true) + (config('twill.settings.crops') ?? [])) !!}
@endif
window['{{ config('twill.js_namespace') }}'].STORE.medias.selected = {}
diff --git a/views/partials/form/_medias.blade.php b/views/partials/form/_medias.blade.php
index 9545875d5..3b2091bd1 100644
--- a/views/partials/form/_medias.blade.php
+++ b/views/partials/form/_medias.blade.php
@@ -3,7 +3,7 @@
type="a17-mediafield-translated"
:attributes="{
label: '{{ $label }}',
- cropContext: '{{ $name }}',
+ cropContext: '{{ !$renderForBlocks ? $name : 'block_' . $name }}',
max: {{ $max }},
widthMin: {{ $widthMin }},
heightMin: {{ $heightMin }},
@@ -38,7 +38,7 @@
@if($multiple)
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