From 5b475cc660b4308d008a2f528cd35b7508914a43 Mon Sep 17 00:00:00 2001
From: HolgerHatGarKeineNode <fsociety.mkv@pm.me>
Date: Tue, 7 Feb 2023 09:54:35 +0100
Subject: [PATCH] hotfix

---
 app/Http/Livewire/Tables/MeetupEventTable.php        | 3 +--
 app/Http/Livewire/Tables/MeetupTable.php             | 1 -
 resources/views/columns/meetup_events/link.blade.php | 2 +-
 resources/views/columns/meetups/name.blade.php       | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/Http/Livewire/Tables/MeetupEventTable.php b/app/Http/Livewire/Tables/MeetupEventTable.php
index a9327543..9a8a706f 100644
--- a/app/Http/Livewire/Tables/MeetupEventTable.php
+++ b/app/Http/Livewire/Tables/MeetupEventTable.php
@@ -76,7 +76,6 @@ class MeetupEventTable extends DataTableComponent
                   ->label(
                       fn($row, Column $column) => view('columns.meetup_events.link')
                           ->withRow($row)
-                          ->withCountry($this->country)
                   ),
         ];
     }
@@ -87,7 +86,7 @@ class MeetupEventTable extends DataTableComponent
                           ->where('meetup_events.start', '>=', now())
                           ->whereHas('meetup.city.country', fn($query) => $query->where('code', $this->country))
                           ->with([
-                              'meetup',
+                              'meetup.city.country',
                           ]);
     }
 }
diff --git a/app/Http/Livewire/Tables/MeetupTable.php b/app/Http/Livewire/Tables/MeetupTable.php
index 2d34bc42..f61d9b97 100644
--- a/app/Http/Livewire/Tables/MeetupTable.php
+++ b/app/Http/Livewire/Tables/MeetupTable.php
@@ -51,7 +51,6 @@ class MeetupTable extends DataTableComponent
                   ->format(
                       fn($value, $row, Column $column) => view('columns.meetups.name')
                           ->withRow($row)
-                          ->withCountry($this->country)
                   )
                   ->searchable(fn($builder, $term) => $builder->where('meetups.name', 'ilike', '%'.$term.'%')),
             Column::make(__('Plebs'))
diff --git a/resources/views/columns/meetup_events/link.blade.php b/resources/views/columns/meetup_events/link.blade.php
index 50174f0c..ef746185 100644
--- a/resources/views/columns/meetup_events/link.blade.php
+++ b/resources/views/columns/meetup_events/link.blade.php
@@ -3,7 +3,7 @@
         <x-button
             primary
             xs
-            :href="route('meetup.event.landing', ['country' => $country, 'meetupEvent' => $row->id])"
+            :href="route('meetup.event.landing', ['country' => $row->meetup->city->country, 'meetupEvent' => $row->id])"
         >
             <i class="fa fa-thin fa-browser mr-2"></i>
             {{ __('Link to participate') }}
diff --git a/resources/views/columns/meetups/name.blade.php b/resources/views/columns/meetups/name.blade.php
index c7b3e135..2ae67341 100644
--- a/resources/views/columns/meetups/name.blade.php
+++ b/resources/views/columns/meetups/name.blade.php
@@ -1,4 +1,4 @@
-<a href="{{ route('meetup.landing', ['country' => $country, 'meetup' => $row]) }}">
+<a href="{{ route('meetup.landing', ['country' => $row->city->country, 'meetup' => $row]) }}">
     <div class="flex items-center space-x-2">
         <img class="h-24" src="{{ $row->getFirstMediaUrl('logo', 'thumb') }}" alt="{{ $row->name }}">
         <div>