From 3dbe3bb0cf403c67da69592b1fe8c3982a65f8f4 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 23 Apr 2019 16:48:09 +0200
Subject: [PATCH] FIX #9806 TIME 0:30 Fix custom fields where clause
---
.../models/DoctypeIndexesModelAbstract.php | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/app/doctype/models/DoctypeIndexesModelAbstract.php b/src/app/doctype/models/DoctypeIndexesModelAbstract.php
index cead9f1e02c..6acc180d440 100755
--- a/src/app/doctype/models/DoctypeIndexesModelAbstract.php
+++ b/src/app/doctype/models/DoctypeIndexesModelAbstract.php
@@ -92,12 +92,15 @@ class DoctypeIndexesModelAbstract
$order = (string) $tableXml->order;
- $res = DatabaseModel::select([
- 'select' => [$foreignKey, $foreignLabel],
- 'table' => [$tableName],
- 'where' => [$whereClause],
- 'order_by' => [str_ireplace("order by", "", $order)]
- ]);
+ $res = [];
+ if (!empty($tableName)) {
+ $res = DatabaseModel::select([
+ 'select' => [$foreignKey, $foreignLabel],
+ 'table' => [$tableName],
+ 'where' => empty($whereClause) ? [] : [$whereClause],
+ 'order_by' => [str_ireplace("order by", "", $order)]
+ ]);
+ }
foreach ($res as $value) {
$values[] = [
--
GitLab