@@ -63,22 +63,22 @@ |
||
| 63 | 63 | ->setModelIdInputName($this->name . '[' . $k . '][modelId]') |
| 64 | 64 | ->setFields($this->fields->clone()->map(function (Field $field) use ($k, $fragment) { |
| 65 | 65 | return $field->name($this->name . '.' . $k . '.' . $field->getName()) |
| 66 | - ->localizedFormat(':name.:locale') |
|
| 67 | - ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) { |
|
| 68 | - if (isset($field->value)) { |
|
| 69 | - return $field->value; |
|
| 70 | - } |
|
| 71 | - |
|
| 72 | - if ($field instanceof MediaField) { |
|
| 73 | - if (!$fragment->hasModelId()) { |
|
| 74 | - return []; |
|
| 75 | - } |
|
| 76 | - |
|
| 77 | - return $field->getMedia(FragmentModel::find($fragment->getModelId()), $locale); |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - return $fragment->getValue($field->getColumn(), $locale); |
|
| 81 | - }); |
|
| 66 | + ->localizedFormat(':name.:locale') |
|
| 67 | + ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) { |
|
| 68 | + if (isset($field->value)) { |
|
| 69 | + return $field->value; |
|
| 70 | + } |
|
| 71 | + |
|
| 72 | + if ($field instanceof MediaField) { |
|
| 73 | + if (!$fragment->hasModelId()) { |
|
| 74 | + return []; |
|
| 75 | + } |
|
| 76 | + |
|
| 77 | + return $field->getMedia(FragmentModel::find($fragment->getModelId()), $locale); |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + return $fragment->getValue($field->getColumn(), $locale); |
|
| 81 | + }); |
|
| 82 | 82 | })); |
| 83 | 83 | } |
| 84 | 84 | |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | public static function ownedBy(FragmentsOwner $owner): ?ContextModel |
| 15 | 15 | { |
| 16 | 16 | return static::where('owner_type', $owner->modelReference()->className()) |
| 17 | - ->where('owner_id', $owner->modelReference()->id()) |
|
| 18 | - ->first(); |
|
| 17 | + ->where('owner_id', $owner->modelReference()->id()) |
|
| 18 | + ->first(); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | public static function createForOwner(FragmentsOwner $owner): ContextModel |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | // so the user has a small window of recovery |
| 40 | 40 | |
| 41 | 41 | if($model instanceof HasAsset) { |
| 42 | - $this->detachAsset->detachAll($model); |
|
| 42 | + $this->detachAsset->detachAll($model); |
|
| 43 | 43 | } |
| 44 | 44 | // TODO: soft-delete the context of this model... (=fragments) |
| 45 | 45 | // Relation::deleteRelationsOf($model->getMorphClass(), $model->id); |