From 67bd50b99c1f623db2ace85723121aedde611270 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 13 Nov 2015 11:30:50 -0600
Subject: [PATCH] queue: Fix topic name selection for columns
---
include/class.search.php | 4 ++++
include/class.topic.php | 2 +-
include/staff/templates/queue-column.tmpl.php | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/class.search.php b/include/class.search.php
index 908bb7fa8..3f55ccccf 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -1211,6 +1211,10 @@ class SavedSearch extends VerySimpleModel {
&& $thisstaff->hasPerm(SearchBackend::PERM_EVERYTHING);
}
+ function inheritCriteria() {
+ return $this->flags & self::FLAG_INHERIT_CRITERIA;
+ }
+
function buildPath() {
if (!$this->id)
return;
diff --git a/include/class.topic.php b/include/class.topic.php
index c2506b421..a08ad5c83 100644
--- a/include/class.topic.php
+++ b/include/class.topic.php
@@ -93,7 +93,7 @@ implements TemplateVariable, Searchable {
static function getSearchableFields() {
return array(
- 'name' => new TextboxField(array(
+ 'topic' => new TextboxField(array(
'label' => __('Name'),
)),
);
diff --git a/include/staff/templates/queue-column.tmpl.php b/include/staff/templates/queue-column.tmpl.php
index bfdd25ce6..41e99bc04 100644
--- a/include/staff/templates/queue-column.tmpl.php
+++ b/include/staff/templates/queue-column.tmpl.php
@@ -141,7 +141,7 @@ if ($column->getConditions()) {
$(function() {
var colid = <?php echo $colid ?: 0; ?>,
nextid = <?php echo QueueColumnCondition::getUid(); ?>;
- $('#' + colid + '-conditions select.add-condition').change(function() {
+ $('#conditions select.add-condition').change(function() {
var $this = $(this),
container = $this.closest('div'),
selected = $this.find(':selected');
--
GitLab