diff --git a/include/class.search.php b/include/class.search.php index 908bb7fa8cc39716b7aba54a5d20558a09b5c7c7..3f55ccccf2ab8e61dfcb1bdc855b9e1bbda4a162 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 c2506b421125e9e97c3b722d1c91b08905447d93..a08ad5c830b3268a04cf6f754c3718f2305a6bba 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 bfdd25ce696747bc86f9aebcbaa437c4c960f4ea..41e99bc048660035f032d0a30d75495a5c750ad3 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');