From 5f883c2d11b37fc0fc787d084f393b8d61703340 Mon Sep 17 00:00:00 2001
From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
Date: Wed, 23 Feb 2022 15:34:45 +0000
Subject: [PATCH 1/4] Change modules branch alias to 3.x

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
---
 app/admin/composer.json  | 3 +--
 app/main/composer.json   | 3 +--
 app/system/composer.json | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/admin/composer.json b/app/admin/composer.json
index f0f4197e4a..14c38c7769 100644
--- a/app/admin/composer.json
+++ b/app/admin/composer.json
@@ -20,7 +20,6 @@
     }
   ],
   "require": {
-    "php": ">=7.4",
     "composer/installers": "~2.0"
   },
   "autoload": {
@@ -30,7 +29,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev"
+      "dev-master": "3.x-dev"
     }
   },
   "minimum-stability": "dev"
diff --git a/app/main/composer.json b/app/main/composer.json
index e3a0a892c6..559501760e 100644
--- a/app/main/composer.json
+++ b/app/main/composer.json
@@ -20,7 +20,6 @@
     }
   ],
   "require": {
-    "php": ">=7.4",
     "composer/installers": "~2.0"
   },
   "autoload": {
@@ -30,7 +29,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev"
+      "dev-master": "3.x-dev"
     }
   },
   "minimum-stability": "dev"
diff --git a/app/system/composer.json b/app/system/composer.json
index 4ef9389371..6553f8692c 100644
--- a/app/system/composer.json
+++ b/app/system/composer.json
@@ -20,7 +20,6 @@
     }
   ],
   "require": {
-    "php": ">=7.4",
     "composer/installers": "~2.0"
   },
   "autoload": {
@@ -30,7 +29,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev"
+      "dev-master": "3.x-dev"
     }
   },
   "minimum-stability": "dev"

From b3938e99293bce5cbfa10626ab4829e267bd0e20 Mon Sep 17 00:00:00 2001
From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
Date: Wed, 23 Feb 2022 15:36:32 +0000
Subject: [PATCH 2/4] Require core modules

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 7ac0fbca0d..395d78e93c 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,9 @@
   "require": {
     "php": ">=7.4",
     "tastyigniter/flame": "~1.2",
+    "tastyigniter/ti-module-system": "~3.0",
+    "tastyigniter/ti-module-admin": "~3.0",
+    "tastyigniter/ti-module-main": "~3.0",
     "laravel/framework": "~8.0"
   },
   "require-dev": {

From 2d5564befc181576e56e25a0b34de5fd11c7ac6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A1i=20Thi=C3=AAn=20V=C5=A9?= <thienvu1802@gmail.com>
Date: Fri, 22 Apr 2022 10:40:44 +0700
Subject: [PATCH 3/4] Add table prefix to related table in search query

---
 app/admin/widgets/Lists.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/admin/widgets/Lists.php b/app/admin/widgets/Lists.php
index c1f1357be0..01cf69eab7 100644
--- a/app/admin/widgets/Lists.php
+++ b/app/admin/widgets/Lists.php
@@ -279,6 +279,7 @@ public function prepareModel()
                 // Relation
                 if ($this->isColumnRelated($column)) {
                     $table = $this->model->makeRelation($column->relation)->getTable();
+                    $table = DB::getTablePrefix() . $table;
                     $columnName = isset($column->sqlSelect)
                         ? DB::raw($this->parseTableName($column->sqlSelect, $table))
                         : $table.'.'.$column->valueFrom;

From b21c2388822bae2abed498b506f5ee95fbb9fc8e Mon Sep 17 00:00:00 2001
From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
Date: Tue, 26 Apr 2022 17:35:13 +0100
Subject: [PATCH 4/4] refactor

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
---
 app/admin/widgets/Lists.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/admin/widgets/Lists.php b/app/admin/widgets/Lists.php
index 01cf69eab7..aa41a43f82 100644
--- a/app/admin/widgets/Lists.php
+++ b/app/admin/widgets/Lists.php
@@ -278,8 +278,7 @@ public function prepareModel()
             foreach ($searchableColumns as $column) {
                 // Relation
                 if ($this->isColumnRelated($column)) {
-                    $table = $this->model->makeRelation($column->relation)->getTable();
-                    $table = DB::getTablePrefix() . $table;
+                    $table = DB::getTablePrefix().$this->model->makeRelation($column->relation)->getTable();
                     $columnName = isset($column->sqlSelect)
                         ? DB::raw($this->parseTableName($column->sqlSelect, $table))
                         : $table.'.'.$column->valueFrom;