From bfaf486377c47997216c245623e650cd2e955ad0 Mon Sep 17 00:00:00 2001
From: Alan Bell <alanbell@ubuntu.com>
Date: Wed, 8 Jun 2016 09:26:25 +0100
Subject: [PATCH] fix #221 use assigned_user_id in preference to other users
 UItype 10 fields

---
 include/QueryGenerator/QueryGenerator.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/QueryGenerator/QueryGenerator.php b/include/QueryGenerator/QueryGenerator.php
index 40932b8b4..5e4e13d14 100644
--- a/include/QueryGenerator/QueryGenerator.php
+++ b/include/QueryGenerator/QueryGenerator.php
@@ -550,7 +550,12 @@ class QueryGenerator {
 		}
 		$ownerFields = $this->meta->getOwnerFields();
 		if (count($ownerFields) > 0) {
-			$ownerField = $ownerFields[0];
+			//there are more than one field pointing to the users table, the real one is the one called assigned_user_id if there is one, otherwise pick the first
+			if(in_array("assigned_user_id",$ownerFields)){
+				$ownerField="assigned_user_id";
+			}else{
+				$ownerField = $ownerFields[0];
+			}
 		}
 		$baseTable = $this->meta->getEntityBaseTable();
 		$sql = " FROM $baseTable ";
-- 
GitLab