Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/js/components/Fieldtypes/DateTime/Field.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},

mounted() {
this.inst = flatpickr(`#flatpickr_${this.field.handle}`, {
this.inst = flatpickr(this.$el.querySelector(`#flatpickr_${this.field.handle}`), {
altFormat: this.field.settings.format,
altInput: true,
dateFormat: 'Y-m-d H:i:S',
Expand Down
4 changes: 2 additions & 2 deletions src/Fieldtypes/AssetFieldtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ public function generateRelationship($field)
*
* @return void
*/
public function persistRelationship($model, Field $field)
public function persistRelationship($model, Field $field, $value = null)
{
$oldValues = $model->{$field->handle}->pluck('id');
$newValues = collect(request()->input($field->handle))->mapWithKeys(function ($item, $key) use ($field) {
$newValues = collect($value ?? request()->input($field->handle))->mapWithKeys(function ($item, $key) use ($field) {
return [
$item['id'] => [
'field_id' => $field->id,
Expand Down
4 changes: 2 additions & 2 deletions src/Fieldtypes/FieldsetFieldtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,14 @@ public function generateRelationship($field)
*
* @return void
*/
public function persistRelationship($model, Field $field)
public function persistRelationship($model, Field $field, $value = null)
{
$fieldset = Fieldset::findOrFail($field->settings['fieldset']);

$model->{$field->handle}()->updateOrCreate([
'field_id' => $field->id,
'fieldset_id' => $fieldset->id,
], request()->input($field->handle, []));
], $value ?? request()->input($field->handle, []));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Fieldtypes/Fieldtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ abstract class Fieldtype
*
* @var string
*/
public $cast = '';
public $cast = null;

/**
* @var null
Expand Down
4 changes: 2 additions & 2 deletions src/Fieldtypes/FormFieldtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ public function generateRelationship($field)
*
* @return void
*/
public function persistRelationship($model, Field $field)
public function persistRelationship($model, Field $field, $value = null)
{
$oldValues = $model->{$field->handle}->pluck('id');
$newValues = collect(request()->input($field->handle))
$newValues = collect($value ?? request()->input($field->handle))
->mapWithKeys(function ($id, $key) use ($field) {
return [
$id => [
Expand Down
8 changes: 4 additions & 4 deletions src/Fieldtypes/ReplicatorFieldtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ public function generateRelationship(Field $field)
*
* @return void
*/
public function persistRelationship($model, Field $field)
public function persistRelationship($model, Field $field, $value = null)
{
$replicator = Replicator::find($field->settings['replicator']);
$replicants = $this->persistReplicants($replicator, $field);
$replicants = $this->persistReplicants($replicator, $field, $value);
$sections = $replicator->sections;

$sections->each(function ($section) use ($model, $replicator, $replicants) {
Expand Down Expand Up @@ -259,9 +259,9 @@ public function getResource($model, Field $field)
*
* @return \Illuminate\Support\Collection
*/
private function persistReplicants(Replicator $replicator, Field $field)
private function persistReplicants(Replicator $replicator, Field $field, $value = null)
{
return collect(request()->input($field->handle, []))
return collect($value ?? request()->input($field->handle, []))
->map(function ($input) use ($replicator) {
$section = Section::findOrFail($input['section']['id']);
$builder = $replicator->getBuilder($section);
Expand Down
4 changes: 2 additions & 2 deletions src/Fieldtypes/TaxonomyFieldtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ public function generateRelationship($field)
*
* @return void
*/
public function persistRelationship($model, Field $field)
public function persistRelationship($model, Field $field, $value = null)
{
$oldValues = $model->{$field->handle}->pluck('id');
$newValues = collect(request()->input($field->handle))
$newValues = collect($value ?? request()->input($field->handle))
->mapWithKeys(function ($id) use ($field) {
return [
$id => [
Expand Down
6 changes: 3 additions & 3 deletions src/Fieldtypes/UserFieldtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Fusion\Fieldtypes;

use File;
use Fusion\Http\Resources\USerResource;
use Fusion\Http\Resources\UserResource;
use Fusion\Models\Field;
use Illuminate\Support\Str;

Expand Down Expand Up @@ -76,10 +76,10 @@ public function generateRelationship($field)
*
* @return void
*/
public function persistRelationship($model, Field $field)
public function persistRelationship($model, Field $field, $value = null)
{
$oldValues = $model->{$field->handle}->pluck('id');
$newValues = collect(request()->input($field->handle))->mapWithKeys(function ($item, $key) use ($field) {
$newValues = collect($value ?? request()->input($field->handle))->mapWithKeys(function ($item, $key) use ($field) {
return [
$item['id'] => [
'field_id' => $field->id,
Expand Down
4 changes: 3 additions & 1 deletion src/Services/Builders/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ public function refresh()

foreach ($this->columns as $column) {
$fillable[] = $column->handle;
$casts[$column->handle] = $column->type()->cast;
if (isset($column->type()->cast)) {
$casts[$column->handle] = $column->type()->cast;
}
}

$fillable = array_merge($this->getFillable(), $fillable);
Expand Down