From 286833e4edd6777c2452c60044af289ccfd1b4a0 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 22 Feb 2023 19:36:24 +0100 Subject: [PATCH] wip #5750 --- src/app/Magic/Models/CubistMagicAbstractModel.php | 4 ++-- src/app/Magic/Models/Translate.php | 8 +++++--- src/resources/views/track-empty-values.blade.php | 9 ++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php index 23b8f72..d49eca7 100644 --- a/src/app/Magic/Models/CubistMagicAbstractModel.php +++ b/src/app/Magic/Models/CubistMagicAbstractModel.php @@ -73,7 +73,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia public $timestamps = true; protected $_enableTrackNonDefaultValues = false; - protected $_enableTracEmptyValues = false; + protected $_enableTrackEmptyValues = false; protected static $_ownerAttribute = null; @@ -1028,7 +1028,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia if ($this->_enableTrackNonDefaultValues) { $res[] = 'cubist_back::track-non-default-values'; } - if ($this->_enableTracEmptyValues) { + if ($this->_enableTrackEmptyValues) { $res[] = 'cubist_back::track-empty-values'; } return array_unique($res); diff --git a/src/app/Magic/Models/Translate.php b/src/app/Magic/Models/Translate.php index 3db5934..9a771e0 100644 --- a/src/app/Magic/Models/Translate.php +++ b/src/app/Magic/Models/Translate.php @@ -70,7 +70,7 @@ class Translate extends CubistMagicTranslatableModel continue; } if (!is_numeric($sectionLabel)) { - if (!$sectionLabel || $sectionLabel=='0') { + if (!$sectionLabel || $sectionLabel == '0') { $sectionLabel = '-'; } $currentSection = $sectionLabel; @@ -105,17 +105,19 @@ class Translate extends CubistMagicTranslatableModel } } + $i = 0; foreach ($sections as $section => $fields) { if (!count($fields)) { continue; } - $this->addField($section, FormSection::class, $section); + $this->addField('s_s' . $i, FormSection::class, $section); foreach ($fields as $field) { - if(!$field){ + if (!$field) { continue; } $this->addField($field); } + $i++; } } diff --git a/src/resources/views/track-empty-values.blade.php b/src/resources/views/track-empty-values.blade.php index 49ca580..1e4305d 100644 --- a/src/resources/views/track-empty-values.blade.php +++ b/src/resources/views/track-empty-values.blade.php @@ -1,7 +1,6 @@ @push('crud_fields_scripts')