diff --git a/include/ajax.search.php b/include/ajax.search.php
index d8ce8dbab1b4ef7443b5a3b664cdac63f3ce4425..93da251e7d164e9548550dce3b35cf16051bbcf3 100644
--- a/include/ajax.search.php
+++ b/include/ajax.search.php
@@ -366,7 +366,7 @@ class SearchAjaxAPI extends AjaxController {
$field_name = $_GET['field'];
$id = $_GET['id'];
$object_id = $_GET['object_id'];
- $condition = new QueueColumnCondition();
+ $condition = new QueueColumnCondition(array());
include STAFFINC_DIR . 'templates/queue-column-condition.tmpl.php';
}
diff --git a/include/class.list.php b/include/class.list.php
index b504d1bb94437b15ff973555ef73a209df3a31bf..e5c84fbd91b58cc2f8dc742bbec745bba1151882 100644
--- a/include/class.list.php
+++ b/include/class.list.php
@@ -1282,7 +1282,7 @@ implements CustomListItem, TemplateVariable, Searchable {
'state' => new TicketStateChoiceField(array(
'label' => __('State'),
)),
- 'name' => new TextBoxField(array(
+ 'id' => new TicketStatusChoiceField(array(
'label' => __('Status Name'),
)),
);
diff --git a/include/class.queue.php b/include/class.queue.php
index 62e1ef5dcab6dcb81540ccf18ae82d3f1dd7612c..cea1404ed892f83fb63b32c91f956cbaca057fd5 100644
--- a/include/class.queue.php
+++ b/include/class.queue.php
@@ -118,12 +118,13 @@ class CustomQueue extends VerySimpleModel {
function getCriteria($include_parent=false) {
if (!isset($this->criteria)) {
- $old = @$this->config[0] === '{';
$this->criteria = is_string($this->config)
? JsonDataParser::decode($this->config)
: $this->config;
+ // XXX: Drop this block in v1.12
// Auto-upgrade v1.10 saved-search criteria to new format
// But support new style with `conditions` support
+ $old = @$this->config[0] === '{';
if ($old && is_array($this->criteria)
&& !isset($this->criteria['conditions'])
) {
@@ -641,7 +642,10 @@ class CustomQueue extends VerySimpleModel {
&& $this->hasFlag(self::FLAG_INHERIT_COLUMNS)
&& $this->parent
) {
- return $this->parent->getColumns();
+ $columns = $this->parent->getColumns();
+ foreach ($columns as $c)
+ $c->setQueue($this);
+ return $columns;
}
elseif (count($this->columns)) {
return $this->columns;
@@ -1214,9 +1218,10 @@ class CustomQueue extends VerySimpleModel {
$errors['criteria'] = __('Validation errors exist on criteria');
}
else {
+ $this->criteria = static::isolateCriteria($form->getClean(),
+ $this->getRoot());
$this->config = JsonDataEncoder::encode([
- 'criteria' => self::isolateCriteria($form->getClean(),
- $this->getRoot()),
+ 'criteria' => $this->criteria,
'conditions' => $conditions,
]);
// Clear currently set criteria.and conditions.
@@ -1684,7 +1689,8 @@ class QueueColumnCondition {
// Add the annotation to a QuerySet
function annotate($query) {
- $Q = $this->getSearchQ($query);
+ if (!($Q = $this->getSearchQ($query)))
+ return $query;
// Add an annotation to the query
return $query->annotate(array(
@@ -1929,6 +1935,7 @@ extends VerySimpleModel {
var $_annotations;
var $_conditions;
+ var $_queue; // Apparent queue if being inherited
function getId() {
return $this->id;
@@ -1947,7 +1954,15 @@ extends VerySimpleModel {
// These getters fetch data from the annotated overlay from the
// queue_column table
function getQueue() {
- return $this->queue;
+ return $this->_queue ?: $this->queue;
+ }
+ /**
+ * If a column is inherited into a child queue and there are conditions
+ * added to that queue, then the column will need to be linked at
+ * run-time to the child queue rather than the parent.
+ */
+ function setQueue(CustomQueue $queue) {
+ $this->_queue = $queue;
}
function getWidth() {
@@ -1993,7 +2008,7 @@ extends VerySimpleModel {
$text = $this->renderBasicValue($row);
// Filter
- if ($filter = $this->getFilter()) {
+ if ($text && ($filter = $this->getFilter())) {
$text = $filter->filter($text, $row) ?: $text;
}
diff --git a/include/class.search.php b/include/class.search.php
index a061cb58eecf3f153b3209c36cf377c7a2d7099c..be17902260dd53b308ffdd3a47ad30156ac7d811 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -1408,6 +1408,8 @@ class TicketStatusChoiceField extends SelectionField {
function getSearchQ($method, $value, $name=false) {
$name = $name ?: $this->get('name');
+ if (!$value)
+ return false;
switch ($method) {
case '!includes':
return Q::not(array("{$name}__in" => array_keys($value)));
diff --git a/include/staff/queue.inc.php b/include/staff/queue.inc.php
index 8506fbee9d1ce3d78b429fe74c969f7f2771f158..b936699df859013ba8706f9c27daba2c310a840e 100644
--- a/include/staff/queue.inc.php
+++ b/include/staff/queue.inc.php
@@ -346,6 +346,8 @@ if ($queue->getConditions()) {
foreach ($queue->getConditions() as $i=>$condition) {
$id = QueueColumnCondition::getUid();
list($label, $field) = $condition->getField();
+ if (!$field || !$label)
+ continue;
$field_name = $condition->getFieldName();
$object_id = $queue->id;
include STAFFINC_DIR . 'templates/queue-column-condition.tmpl.php';
diff --git a/include/staff/templates/queue-column.tmpl.php b/include/staff/templates/queue-column.tmpl.php
index 806825ad4ade38dbb6c33052c38e1be774626a2d..3ca9d9a310268851e76d061b1b88d8fadbee2c33 100644
--- a/include/staff/templates/queue-column.tmpl.php
+++ b/include/staff/templates/queue-column.tmpl.php
@@ -122,6 +122,8 @@ if ($column->getConditions(false)) {
foreach ($column->getConditions() as $i=>$condition) {
$id = QueueColumnCondition::getUid();
list($label, $field) = $condition->getField();
+ if (!$label || !$field)
+ continue;
$field_name = $condition->getFieldName();
$object_id = $column->getId();
include STAFFINC_DIR . 'templates/queue-column-condition.tmpl.php';
diff --git a/include/staff/templates/queue-columns.tmpl.php b/include/staff/templates/queue-columns.tmpl.php
index 6088c925de0233116b5e39d457741dcb9d3ec9d6..fd8e99529a4ac346ebdfa177b100a735ae5fa9a4 100644
--- a/include/staff/templates/queue-columns.tmpl.php
+++ b/include/staff/templates/queue-columns.tmpl.php
@@ -1,12 +1,13 @@
<div style="overflow-y: auto; height:auto; max-height: 350px;">
<table class="table">
<?php
+$hidden_cols = $queue->inheritColumns() || count($queue->columns) === 0;
if ($queue->parent) { ?>
<tbody>
<tr>
<td colspan="3">
<input type="checkbox" name="inherit-columns" <?php
- if ($queue->inheritColumns()) echo 'checked="checked"'; ?>
+ if ($hidden_cols) echo 'checked="checked"'; ?>
onchange="javascript:$(this).closest('table').find('.if-not-inherited').toggle(!$(this).prop('checked'));" />
<?php echo __('Inherit columns from the parent queue'); ?>
<br /><br />
diff --git a/include/staff/templates/queue-savedsearches-nav.tmpl.php b/include/staff/templates/queue-savedsearches-nav.tmpl.php
index 4899b794a2edce13e0cc6009f6f23beb883cb1e4..ef06cf06c91db2b6e5a32ea0395885cc8d05cd25 100644
--- a/include/staff/templates/queue-savedsearches-nav.tmpl.php
+++ b/include/staff/templates/queue-savedsearches-nav.tmpl.php
@@ -18,11 +18,13 @@
<!-- Start Dropdown and child queues -->
<?php foreach ($searches->findAll(array(
'staff_id' => $thisstaff->getId(),
+ 'parent_id' => 0,
Q::not(array(
'flags__hasbit' => CustomQueue::FLAG_PUBLIC
))
)) as $q) {
- include 'queue-subnavigation.tmpl.php';
+ if ($q->checkAccess($thisstaff))
+ include 'queue-subnavigation.tmpl.php';
} ?>
<?php
if (isset($_SESSION['advsearch'])) { ?>