From c6cd84f02608a1c9a1d288b8f1ace10cbd9e05bb Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Tue, 14 Aug 2018 10:55:26 -0500
Subject: [PATCH] queues: Row Conditions
This addresses an issue where row conditions are working in the preview but
not in the actual ticket queue. This updates the `getQueue()` function to
lookup the CustomQueue by `queue_id` if there is no CustomQueue object found
in the QueueColumn.
---
include/class.queue.php | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/include/class.queue.php b/include/class.queue.php
index 87f2850ef..a8ebafb3d 100644
--- a/include/class.queue.php
+++ b/include/class.queue.php
@@ -2001,7 +2001,16 @@ extends VerySimpleModel {
// These getters fetch data from the annotated overlay from the
// queue_column table
function getQueue() {
- return $this->_queue ?: $this->queue;
+ if (!isset($this->_queue)) {
+ $queue = $this->queue;
+
+ if (!$queue && ($queue_id = $this->queue_id))
+ $queue = CustomQueue::lookup($queue_id);
+
+ $this->_queue = $queue;
+ }
+
+ return $this->_queue;
}
/**
* If a column is inherited into a child queue and there are conditions
--
GitLab