From 7ce834983366c74ebcc4bc30d2722e11e702dccb Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Sat, 9 Mar 2019 00:58:09 +0000
Subject: [PATCH] Queue Columns
Allow admin to setup columns when creating a new parent queue and address an
issue where Assignee standard columns used a wrong Id.
---
include/class.queue.php | 4 ++--
include/staff/templates/queue-columns.tmpl.php | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/class.queue.php b/include/class.queue.php
index e336c2085..2f1b4a926 100644
--- a/include/class.queue.php
+++ b/include/class.queue.php
@@ -723,7 +723,7 @@ class CustomQueue extends VerySimpleModel {
"bits" => QueueColumn::FLAG_SORTABLE,
)),
QueueColumn::placeholder(array(
- "id" => 6,
+ "id" => 8,
"heading" => "Assignee",
"primary" => 'assignee',
"width" => 100,
@@ -1229,7 +1229,7 @@ class CustomQueue extends VerySimpleModel {
$this->path = $this->buildPath();
$this->setFlag(self::FLAG_INHERIT_CRITERIA, $this->parent_id);
$this->setFlag(self::FLAG_INHERIT_COLUMNS,
- isset($vars['inherit-columns']));
+ $this->parent_id > 0 && isset($vars['inherit-columns']));
$this->setFlag(self::FLAG_INHERIT_EXPORT,
$this->parent_id > 0 && isset($vars['inherit-exports']));
$this->setFlag(self::FLAG_INHERIT_SORTING,
diff --git a/include/staff/templates/queue-columns.tmpl.php b/include/staff/templates/queue-columns.tmpl.php
index fd8e99529..5db261a8e 100644
--- a/include/staff/templates/queue-columns.tmpl.php
+++ b/include/staff/templates/queue-columns.tmpl.php
@@ -29,7 +29,8 @@ if ($queue->parent) { ?>
</tr>
</tbody>
<?php }
-$hidden_cols = $queue->inheritColumns() || $queue->useStandardColumns();
+$hidden_cols = $queue->inheritColumns() || ($queue->useStandardColumns() &&
+ $queue->parent_id);
?>
<tbody class="if-not-inherited <?php if ($hidden_cols) echo 'hidden'; ?>">
<tr class="header">
--
GitLab