queue: Fix topic name selection for columns

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;

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'),
             )),
         );

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');