[Rt-commit] [rtir] 13/19: Remove incorrect use of BaseQuery

[Jesse Vincent]

This is an automated email from the git hooks/post-receive script.

jesse pushed a commit to branch 3.4/remove_old_constituencies
in repository rtir.

commit 60e7923a822a2be6901ae9c72a61a35047dc2480
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Mar 24 20:10:05 2015 -0700

    Remove incorrect use of BaseQuery
---
 html/RTIR/Link/FromIncident/index.html | 9 +--------
 html/RTIR/Link/ToIncident/index.html   | 6 +-----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/html/RTIR/Link/FromIncident/index.html b/html/RTIR/Link/FromIncident/index.html
index 4cd0812..b42fb22 100644
--- a/html/RTIR/Link/FromIncident/index.html
+++ b/html/RTIR/Link/FromIncident/index.html
@@ -60,7 +60,6 @@
 
 <& /RTIR/Search/Elements/ShowResults, 
     Lifecycle     => $Lifecycle,
-    BaseQuery     => $BaseQuery,
     Query         => $Query,
     DisplayFormat => "__CheckBox__, $Format",
     Format        => $Format,
@@ -78,8 +77,7 @@
 <%ARGS>
 $id          => undef
 $Lifecycle       => undef
-
-$Query       => RT::IR->ActiveQuery( Lifecycle => $Lifecycle, Constituency =>  $m->{'RTIR_ConstituencyFilter'} )
+$Query       => RT::IR->ActiveQuery( Lifecycle => $Lifecycle, Constituency =>  $m->{'RTIR_ConstituencyFilter'}, Lifecycle => $Lifecycle, NotMemberOf => $id )
 $Format      => RT->Config->Get('RTIRSearchResultFormats')->{'LinkChildren'}
 $Rows        => 50
 $Page        => 1
@@ -94,11 +92,6 @@ $ARGS{'id'} = $id = $IncidentObj->id;
 my $Type = RT::IR::TicketType( Lifecycle => $Lifecycle );
 my $title = loc("Link selected [_1] to Incident #[_2]", $Type, $id);
 
-my $BaseQuery = RT::IR->Query(
-    Lifecycle => $Lifecycle,
-    NotMemberOf => $id,
-);
-
 my $base_url = RT::IR->HREFTo('Link/FromIncident/?'
     . $m->comp( '/Elements/QueryString', id => $id, Lifecycle => $Lifecycle ));
 
diff --git a/html/RTIR/Link/ToIncident/index.html b/html/RTIR/Link/ToIncident/index.html
index fc8b854..64027dc 100644
--- a/html/RTIR/Link/ToIncident/index.html
+++ b/html/RTIR/Link/ToIncident/index.html
@@ -64,7 +64,6 @@
 <input type="hidden" name="Child" value="<% $id %>" />
 
 <& /RTIR/Search/Elements/ShowResults, 
-    BaseQuery     => $BaseQuery,
     Query         => $Query,
     DisplayFormat => "__RadioButton__, $Format",
     Format        => $Format,
@@ -92,11 +91,8 @@ $m->callback(CallbackName => 'Initial', %ARGS, Ticket => $Ticket);
 my $Type = RT::IR::TicketType( Ticket => $Ticket );
 my $title = loc( "Link [_1] #[_2] to selected Incident", $Type, $id );
 
-# BaseQuery is "things that the user can't delete
-my $BaseQuery = RT::IR->Query( HasNoMember => $id, Lifecycle => 'incidents');
-
 # $Query is 'defaults'
-$Query ||= RT::IR->ActiveQuery( Constituency =>  $m->{'RTIR_ConstituencyFilter'});
+$Query ||= RT::IR->ActiveQuery( Constituency =>  $m->{'RTIR_ConstituencyFilter'}, HasNoMember => $id, Lifecycle => 'incidents');
 
 </%INIT>
 <%ARGS>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.