Skip to content

Commit ec24c10

Browse files
tabacitutabacitu
authored
Merge pull request #4338 from Laravel-Backpack/entity-should-be-false-if-not-otherwise-specified
field entity should be false if not otherwise specified
2 parents 9d235ff + 5c697e6 commit ec24c10

File tree

6 files changed

+62
-1
lines changed

6 files changed

+62
-1
lines changed

‎src/app/Library/CrudPanel/Traits/Create.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function getRelationFields($fields = [])
5252
$relationFields = [];
5353

5454
foreach ($fields as $field) {
55-
if (isset($field['model']) && $field['model'] !== false) {
55+
if (isset($field['model']) && $field['model'] !== false && $field['entity'] !== false) {
5656
array_push($relationFields, $field);
5757
}
5858

‎src/app/Library/CrudPanel/Traits/FieldsProtectedMethods.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ protected function makeSureFieldHasEntity($field)
138138
return $field;
139139
}
140140

141+
// by default, entity is false if we cannot link it with guessing functions to a relation
142+
$field['entity'] = false;
143+
141144
// if the name is an array it's definitely not a relationship
142145
if (is_array($field['name'])) {
143146
return $field;

‎tests/Unit/CrudPanel/CrudPanelAutoSetTest.php‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
456456
'values' => [],
457457
'attributes' => [],
458458
'autoset' => true,
459+
'entity' => false,
459460
],
460461
'binaryCol' => [
461462
'name' => 'binaryCol',
@@ -466,6 +467,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
466467
'values' => [],
467468
'attributes' => [],
468469
'autoset' => true,
470+
'entity' => false,
469471
],
470472
'booleanCol' => [
471473
'name' => 'booleanCol',
@@ -476,6 +478,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
476478
'values' => [],
477479
'attributes' => [],
478480
'autoset' => true,
481+
'entity' => false,
479482
],
480483
'charCol' => [
481484
'name' => 'charCol',
@@ -486,6 +489,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
486489
'values' => [],
487490
'attributes' => [],
488491
'autoset' => true,
492+
'entity' => false,
489493
],
490494
'dateCol' => [
491495
'name' => 'dateCol',
@@ -496,6 +500,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
496500
'values' => [],
497501
'attributes' => [],
498502
'autoset' => true,
503+
'entity' => false,
499504
],
500505
'dateTimeCol' => [
501506
'name' => 'dateTimeCol',
@@ -506,6 +511,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
506511
'values' => [],
507512
'attributes' => [],
508513
'autoset' => true,
514+
'entity' => false,
509515
],
510516
'dateTimeTzCol' => [
511517
'name' => 'dateTimeTzCol',
@@ -516,6 +522,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
516522
'values' => [],
517523
'attributes' => [],
518524
'autoset' => true,
525+
'entity' => false,
519526
],
520527
'decimalCol' => [
521528
'name' => 'decimalCol',
@@ -526,6 +533,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
526533
'values' => [],
527534
'attributes' => [],
528535
'autoset' => true,
536+
'entity' => false,
529537
],
530538
'doubleCol' => [
531539
'name' => 'doubleCol',
@@ -536,6 +544,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
536544
'values' => [],
537545
'attributes' => [],
538546
'autoset' => true,
547+
'entity' => false,
539548
],
540549
'enumCol' => [
541550
'name' => 'enumCol',
@@ -546,6 +555,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
546555
'values' => [],
547556
'attributes' => [],
548557
'autoset' => true,
558+
'entity' => false,
549559
],
550560
'floatCol' => [
551561
'name' => 'floatCol',
@@ -556,6 +566,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
556566
'values' => [],
557567
'attributes' => [],
558568
'autoset' => true,
569+
'entity' => false,
559570
],
560571
'integerCol' => [
561572
'name' => 'integerCol',
@@ -566,6 +577,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
566577
'values' => [],
567578
'attributes' => [],
568579
'autoset' => true,
580+
'entity' => false,
569581
],
570582
'ipAddressCol' => [
571583
'name' => 'ipAddressCol',
@@ -576,6 +588,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
576588
'values' => [],
577589
'attributes' => [],
578590
'autoset' => true,
591+
'entity' => false,
579592
],
580593
'jsonCol' => [
581594
'name' => 'jsonCol',
@@ -586,6 +599,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
586599
'values' => [],
587600
'attributes' => [],
588601
'autoset' => true,
602+
'entity' => false,
589603
],
590604
'jsonbCol' => [
591605
'name' => 'jsonbCol',
@@ -596,6 +610,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
596610
'values' => [],
597611
'attributes' => [],
598612
'autoset' => true,
613+
'entity' => false,
599614
],
600615
'longTextCol' => [
601616
'name' => 'longTextCol',
@@ -606,6 +621,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
606621
'values' => [],
607622
'attributes' => [],
608623
'autoset' => true,
624+
'entity' => false,
609625
],
610626
'macAddressCol' => [
611627
'name' => 'macAddressCol',
@@ -616,6 +632,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
616632
'values' => [],
617633
'attributes' => [],
618634
'autoset' => true,
635+
'entity' => false,
619636
],
620637
'mediumIntegerCol' => [
621638
'name' => 'mediumIntegerCol',
@@ -626,6 +643,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
626643
'values' => [],
627644
'attributes' => [],
628645
'autoset' => true,
646+
'entity' => false,
629647
],
630648
'mediumTextCol' => [
631649
'name' => 'mediumTextCol',
@@ -636,6 +654,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
636654
'values' => [],
637655
'attributes' => [],
638656
'autoset' => true,
657+
'entity' => false,
639658
],
640659
'smallIntegerCol' => [
641660
'name' => 'smallIntegerCol',
@@ -646,6 +665,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
646665
'values' => [],
647666
'attributes' => [],
648667
'autoset' => true,
668+
'entity' => false,
649669
],
650670
'stringCol' => [
651671
'name' => 'stringCol',
@@ -656,6 +676,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
656676
'values' => [],
657677
'attributes' => [],
658678
'autoset' => true,
679+
'entity' => false,
659680
],
660681
'textCol' => [
661682
'name' => 'textCol',
@@ -666,6 +687,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
666687
'values' => [],
667688
'attributes' => [],
668689
'autoset' => true,
690+
'entity' => false,
669691
],
670692
'timeCol' => [
671693
'name' => 'timeCol',
@@ -676,6 +698,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
676698
'values' => [],
677699
'attributes' => [],
678700
'autoset' => true,
701+
'entity' => false,
679702
],
680703
'timeTzCol' => [
681704
'name' => 'timeTzCol',
@@ -686,6 +709,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
686709
'values' => [],
687710
'attributes' => [],
688711
'autoset' => true,
712+
'entity' => false,
689713
],
690714
'tinyIntegerCol' => [
691715
'name' => 'tinyIntegerCol',
@@ -696,6 +720,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
696720
'values' => [],
697721
'attributes' => [],
698722
'autoset' => true,
723+
'entity' => false,
699724
],
700725
'timestampCol' => [
701726
'name' => 'timestampCol',
@@ -706,6 +731,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
706731
'values' => [],
707732
'attributes' => [],
708733
'autoset' => true,
734+
'entity' => false,
709735
],
710736
'timestampTzCol' => [
711737
'name' => 'timestampTzCol',
@@ -716,6 +742,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
716742
'values' => [],
717743
'attributes' => [],
718744
'autoset' => true,
745+
'entity' => false,
719746
],
720747
'uuidCol' => [
721748
'name' => 'uuidCol',
@@ -726,6 +753,7 @@ class CrudPanelAutoSetTest extends BaseDBCrudPanelTest
726753
'values' => [],
727754
'attributes' => [],
728755
'autoset' => true,
756+
'entity' => false,
729757
],
730758
];
731759

‎tests/Unit/CrudPanel/CrudPanelFieldsTest.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class CrudPanelFieldsTest extends BaseDBCrudPanelTest
2121
'name' => 'field1',
2222
'label' => 'Field1',
2323
'type' => 'text',
24+
'entity' => false,
2425
],
2526
];
2627

@@ -56,11 +57,13 @@ class CrudPanelFieldsTest extends BaseDBCrudPanelTest
5657
'name' => 'field1',
5758
'label' => 'Field1',
5859
'type' => 'text',
60+
'entity' => false,
5961
],
6062
'field2' => [
6163
'name' => 'field2',
6264
'label' => 'Field2',
6365
'type' => 'text',
66+
'entity' => false,
6467
],
6568
];
6669

@@ -84,16 +87,19 @@ class CrudPanelFieldsTest extends BaseDBCrudPanelTest
8487
'name' => 'field1',
8588
'label' => 'Field1',
8689
'type' => 'text',
90+
'entity' => false,
8791
],
8892
'field2' => [
8993
'name' => 'field2',
9094
'label' => 'Field2',
9195
'type' => 'text',
96+
'entity' => false,
9297
],
9398
'field3' => [
9499
'name' => 'field3',
95100
'label' => 'Field3',
96101
'type' => 'text',
102+
'entity' => false,
97103
],
98104
];
99105

@@ -153,61 +159,73 @@ class CrudPanelFieldsTest extends BaseDBCrudPanelTest
153159
'name' => 'field1',
154160
'label' => 'Field1',
155161
'type' => 'text',
162+
'entity' => false,
156163
],
157164
'field2' => [
158165
'name' => 'field2',
159166
'type' => 'address',
160167
'label' => 'Field2',
168+
'entity' => false,
161169
],
162170
'field3' => [
163171
'name' => 'field3',
164172
'type' => 'address',
165173
'label' => 'Field3',
174+
'entity' => false,
166175
],
167176
'field4' => [
168177
'name' => 'field4',
169178
'type' => 'checkbox',
170179
'label' => 'Field4',
180+
'entity' => false,
171181
],
172182
'field5' => [
173183
'name' => 'field5',
174184
'type' => 'date',
175185
'label' => 'Field5',
186+
'entity' => false,
176187
],
177188
'field6' => [
178189
'name' => 'field6',
179190
'type' => 'email',
180191
'label' => 'Field6',
192+
'entity' => false,
181193
],
182194
'field7' => [
183195
'name' => 'field7',
184196
'type' => 'hidden',
185197
'label' => 'Field7',
198+
'entity' => false,
186199
],
187200
'field8' => [
188201
'name' => 'field8',
189202
'type' => 'password',
190203
'label' => 'Field8',
204+
'entity' => false,
191205
],
192206
'field9' => [
193207
'name' => 'field9',
194208
'type' => 'select2',
195209
'label' => 'Field9',
210+
'entity' => false,
196211
],
197212
'field10' => [
198213
'name' => 'field10',
199214
'type' => 'select2_multiple',
200215
'label' => 'Field10',
216+
'entity' => false,
201217
],
202218
'field11' => [
203219
'name' => 'field11',
204220
'type' => 'table',
205221
'label' => 'Field11',
222+
'entity' => false,
206223
],
207224
'field12' => [
208225
'name' => 'field12',
209226
'type' => 'url',
210227
'label' => 'Field12',
228+
'entity' => false,
211229
],
212230
];
213231

0 commit comments

Comments
 (0)