From 5e84a71261f1e42df0561c47efa226b94705b644 Mon Sep 17 00:00:00 2001
From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
Date: Thu, 30 Jun 2022 15:41:58 +0100
Subject: [PATCH] Ensure list column names do not much model relation name

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
---
 app/admin/models/config/categories_model.php     | 5 +++--
 app/admin/models/config/mealtimes_model.php      | 3 ++-
 app/admin/models/config/menus_model.php          | 3 ++-
 app/admin/models/config/status_history_model.php | 3 ++-
 app/admin/models/config/tables_model.php         | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/admin/models/config/categories_model.php b/app/admin/models/config/categories_model.php
index 40044c280a..13775e311c 100644
--- a/app/admin/models/config/categories_model.php
+++ b/app/admin/models/config/categories_model.php
@@ -1,4 +1,5 @@
 <?php
+
 $config['list']['filter'] = [
     'search' => [
         'prompt' => 'lang:admin::lang.categories.text_filter_search',
@@ -70,13 +71,13 @@
         'label' => 'lang:admin::lang.label_name',
         'type' => 'text',
     ],
-    'parent_cat' => [
+    'parent' => [
         'label' => 'lang:admin::lang.categories.column_parent',
         'type' => 'text',
         'relation' => 'parent_cat',
         'select' => 'name',
     ],
-    'locations' => [
+    'location_name' => [
         'label' => 'lang:admin::lang.column_location',
         'type' => 'text',
         'relation' => 'locations',
diff --git a/app/admin/models/config/mealtimes_model.php b/app/admin/models/config/mealtimes_model.php
index 830f1336d1..1a639a6601 100644
--- a/app/admin/models/config/mealtimes_model.php
+++ b/app/admin/models/config/mealtimes_model.php
@@ -1,4 +1,5 @@
 <?php
+
 $config['list']['filter'] = [
     'scopes' => [
         'location' => [
@@ -82,7 +83,7 @@
         'label' => 'lang:admin::lang.column_id',
         'invisible' => true,
     ],
-    'locations' => [
+    'location_name' => [
         'label' => 'lang:admin::lang.column_location',
         'type' => 'text',
         'relation' => 'locations',
diff --git a/app/admin/models/config/menus_model.php b/app/admin/models/config/menus_model.php
index 7fdc5bfb5d..19bd9ead1b 100644
--- a/app/admin/models/config/menus_model.php
+++ b/app/admin/models/config/menus_model.php
@@ -1,4 +1,5 @@
 <?php
+
 $config['list']['filter'] = [
     'search' => [
         'prompt' => 'lang:admin::lang.menus.text_filter_search',
@@ -89,7 +90,7 @@
         'relation' => 'categories',
         'select' => 'name',
     ],
-    'locations' => [
+    'location_name' => [
         'label' => 'lang:admin::lang.column_location',
         'type' => 'text',
         'relation' => 'locations',
diff --git a/app/admin/models/config/status_history_model.php b/app/admin/models/config/status_history_model.php
index 278a0e79f2..1ecb97af56 100644
--- a/app/admin/models/config/status_history_model.php
+++ b/app/admin/models/config/status_history_model.php
@@ -1,4 +1,5 @@
 <?php
+
 $config['list']['columns'] = [
     'created_at' => [
         'label' => 'lang:admin::lang.statuses.column_time_date',
@@ -9,7 +10,7 @@
         'relation' => 'staff',
         'select' => 'staff_name',
     ],
-    'status' => [
+    'status_name' => [
         'label' => 'lang:admin::lang.label_status',
         'relation' => 'status',
         'select' => 'status_name',
diff --git a/app/admin/models/config/tables_model.php b/app/admin/models/config/tables_model.php
index b61de97800..c3d3fb1dbb 100644
--- a/app/admin/models/config/tables_model.php
+++ b/app/admin/models/config/tables_model.php
@@ -1,4 +1,5 @@
 <?php
+
 $config['list']['filter'] = [
     'search' => [
         'prompt' => 'lang:admin::lang.tables.text_filter_search',
@@ -90,7 +91,7 @@
         'type' => 'number',
         'invisible' => true,
     ],
-    'locations' => [
+    'location_name' => [
         'label' => 'lang:admin::lang.column_location',
         'type' => 'text',
         'relation' => 'locations',