[Rt-commit] rtir branch, 2.9-trunk, updated. 3.0.0rc1-34-g8b4702f

[Kevin Falcone]

The branch, 2.9-trunk has been updated
       via  8b4702f1ec143a7ae17b9e90671d8e1d832ed4c3 (commit)
      from  256f7786242283d65d67fda54d003228b1e301ab (commit)

Summary of changes:
 html/RTIR/Search/Elements/BuildQuery   | 4 ++--
 html/RTIR/Search/Elements/ProcessQuery | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 8b4702f1ec143a7ae17b9e90671d8e1d832ed4c3
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jan 25 15:06:14 2013 -0500

    cfqueues was renamed to queues in 67ed6217
    
    Without this change, picking a Queue in the Query Builder meant that RT
    never showed the applied CFs (it would show global CFs).

diff --git a/html/RTIR/Search/Elements/BuildQuery b/html/RTIR/Search/Elements/BuildQuery
index e1306fc..aee90b8 100644
--- a/html/RTIR/Search/Elements/BuildQuery
+++ b/html/RTIR/Search/Elements/BuildQuery
@@ -52,7 +52,7 @@
 <input type="hidden" class="hidden" name="Query" value="<% $query{'Query'} %>" />
 <input type="hidden" class="hidden" name="Format" value="<% $query{'Format'} %>" />
 
-<div id="pick-criteria"><& /Search/Elements/PickCriteria, cfqueues => $queues &></div>
+<div id="pick-criteria"><& /Search/Elements/PickCriteria, queues => $queues &></div>
 
 <& /Elements/Submit, Label => loc('Add these terms'), Name => 'AddClause' &>
 <& /Elements/Submit, Label => loc('Add these terms and Search'), Name => 'DoSearch' &>
@@ -71,7 +71,7 @@
 </div>
 
 <span id="display-options">
-<& /Search/Elements/DisplayOptions, %ARGS, %query, cfqueues => $queues &>
+<& /Search/Elements/DisplayOptions, %ARGS, %query, queues => $queues &>
 </span>
 
 <& /Elements/Submit,
diff --git a/html/RTIR/Search/Elements/ProcessQuery b/html/RTIR/Search/Elements/ProcessQuery
index b910320..eb32fe5 100644
--- a/html/RTIR/Search/Elements/ProcessQuery
+++ b/html/RTIR/Search/Elements/ProcessQuery
@@ -168,7 +168,7 @@ my ( $AvailableColumns, $CurrentFormat );
 ( $query{'Format'}, $AvailableColumns, $CurrentFormat ) = $m->comp(
     '/Search/Elements/BuildFormatString',
     %ARGS,
-    cfqueues => $queues,
+    queues => $queues,
     Format => $query{'Format'},
 );
 

-----------------------------------------------------------------------