Merge pull request #749 from owlchester/bulk-parent-should-be-named-p…

…arent Bulk: Parents should be named parent
owlchester · Oct 10, 2023 · a0b0a78 · a0b0a78
2 parents 632803d + f9e0d97
commit a0b0a78
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 15 deletions.
diff --git a/app/Datagrids/Bulks/AbilityBulk.php b/app/Datagrids/Bulks/AbilityBulk.php
@@ -7,7 +7,7 @@ class AbilityBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'ability_id',
+        'parent_ability_id',
         'tags',
         'private_choice',
     ];

diff --git a/app/Datagrids/Bulks/CreatureBulk.php b/app/Datagrids/Bulks/CreatureBulk.php
@@ -7,7 +7,7 @@ class CreatureBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'creature_id',
+        'parent_creature_id',
         'tags',
         'private_choice',
     ];

diff --git a/app/Datagrids/Bulks/EventBulk.php b/app/Datagrids/Bulks/EventBulk.php
@@ -7,7 +7,7 @@ class EventBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'event_id',
+        'parent_event_id',
         'location_id',
         'tags',
         'private_choice',

diff --git a/app/Datagrids/Bulks/FamilyBulk.php b/app/Datagrids/Bulks/FamilyBulk.php
@@ -7,7 +7,7 @@ class FamilyBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'family_id',
+        'parent_family_id',
         'location_id',
         'tags',
         'private_choice',

diff --git a/app/Datagrids/Bulks/ItemBulk.php b/app/Datagrids/Bulks/ItemBulk.php
@@ -9,7 +9,7 @@ class ItemBulk extends Bulk
         'type',
         'price',
         'size',
-        'item_id',
+        'parent_item_id',
         'location_id',
         'character_id',
         'tags',

diff --git a/app/Datagrids/Bulks/JournalBulk.php b/app/Datagrids/Bulks/JournalBulk.php
@@ -7,7 +7,7 @@ class JournalBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'journal_id',
+        'parent_journal_id',
         'author_id',
         'location_id',
         'tags',

diff --git a/app/Datagrids/Bulks/MapBulk.php b/app/Datagrids/Bulks/MapBulk.php
@@ -7,7 +7,7 @@ class MapBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'map_id',
+        'parent_map_id',
         'tags',
         'private_choice',
     ];

diff --git a/app/Datagrids/Bulks/NoteBulk.php b/app/Datagrids/Bulks/NoteBulk.php
@@ -7,7 +7,7 @@ class NoteBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'note_id',
+        'parent_note_id',
         'tags',
         'private_choice',
     ];

diff --git a/app/Datagrids/Bulks/OrganisationBulk.php b/app/Datagrids/Bulks/OrganisationBulk.php
@@ -8,7 +8,7 @@ class OrganisationBulk extends Bulk
         'name',
         'type',
         'location_id',
-        'organisation_id',
+        'parent_organisation_id',
         'tags',
         'private_choice',
         'defunct_choice'

diff --git a/app/Datagrids/Bulks/QuestBulk.php b/app/Datagrids/Bulks/QuestBulk.php
@@ -7,7 +7,7 @@ class QuestBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'quest_id',
+        'parent_quest_id',
         'instigator_id',
         'completed_choice',
         'tags',

diff --git a/app/Datagrids/Bulks/RaceBulk.php b/app/Datagrids/Bulks/RaceBulk.php
@@ -7,7 +7,7 @@ class RaceBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'race_id',
+        'parent_race_id',
         'tags',
         'private_choice',
     ];

diff --git a/app/Datagrids/Bulks/TagBulk.php b/app/Datagrids/Bulks/TagBulk.php
@@ -8,7 +8,7 @@ class TagBulk extends Bulk
         'name',
         'type',
         'colour',
-        'tag_id',
+        'parent_tag_id',
         'private_choice',
         'auto_applied_choice',
         'hide_choice',

diff --git a/app/Datagrids/Bulks/TimelineBulk.php b/app/Datagrids/Bulks/TimelineBulk.php
@@ -7,7 +7,7 @@ class TimelineBulk extends Bulk
     protected array $fields = [
         'name',
         'type',
-        'timeline_id',
+        'parent_timeline_id',
         'tags',
         'private_choice',
     ];

diff --git a/resources/views/cruds/datagrids/bulks/modals/batch.blade.php b/resources/views/cruds/datagrids/bulks/modals/batch.blade.php
@@ -3,7 +3,12 @@
 <x-dialog id="bulk-edit" :title="__('crud.bulk.edit.title')" footer="cruds.datagrids.bulks.modals._batch-footer">
     <x-grid>
         @foreach ($bulk->fields() as $field)
-            @php $trimmed = \Illuminate\Support\Str::beforeLast($field, '_id'); @endphp
+            @php 
+                $trimmed = \Illuminate\Support\Str::between($field,'parent_', '_id'); 
+                $isParent = \Illuminate\Support\Str::contains($field, 'parent');
+            @endphp
+
+
             {!! $fieldCount % 2 === 0 ? '' : null !!}
             @include('cruds.fields.' . $trimmed, [
                 'trans' => $name,
@@ -13,6 +18,7 @@
                 'allowNew' => false,
                 'dropdownParent' => '#bulk-edit',
                 'route' => null,
+                'isParent' => $isParent,
             ])
             @php $fieldCount++; @endphp
         @endforeach

diff --git a/resources/views/cruds/fields/parent_location.blade.php b/resources/views/cruds/fields/parent_location.blade.php