fix: primary key

id changed to getKeyName
moonshine-software · Jul 26, 2023 · 15c34bb · 15c34bb
1 parent 5abbd7d
commit 15c34bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Notifications/MoonShineNotification.php b/src/Notifications/MoonShineNotification.php
@@ -24,7 +24,10 @@ public static function send(
                 MoonShineAuth::model()->query()
                     ->when(
                         $ids,
-                        fn ($query): Builder => $query->whereIn('id', $ids)
+                        fn ($query): Builder => $query->whereIn(
+                            MoonShineAuth::model()?->getKeyName() ?? 'id',
+                            $ids
+                        )
                     )
                     ->get(),
                 MoonShineDatabaseNotification::make(

diff --git a/src/Traits/Fields/WithJsonValues.php b/src/Traits/Fields/WithJsonValues.php
@@ -69,7 +69,7 @@ public function jsonValues(Model $item = null): array
                         $fieldValue = $field->formViewValue($data);
 
                         if ($field instanceof BelongsToMany) {
-                            $fieldValue = $fieldValue->pluck('id');
+                            $fieldValue = $fieldValue->pluck($data->getKeyName());
                         }
 
                         $values[$index][$field->field()] = $fieldValue;