[freeside-commits] branch FREESIDE_3_BRANCH updated. 1313896e5b0cd551fc4449fe6dd8c863d5d1de4a

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  1313896e5b0cd551fc4449fe6dd8c863d5d1de4a (commit)
      from  dd620f18b9a9dd01d4a21de9fb4f1194ba6d003d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1313896e5b0cd551fc4449fe6dd8c863d5d1de4a
Author: Mark Wells <mark at freeside.biz>
Date:   Thu May 26 12:11:56 2016 -0700

    #41670, backporting fix

diff --git a/rt/lib/RT/Search/UnrepliedTickets.pm b/rt/lib/RT/Search/UnrepliedTickets.pm
index a996901..611675a 100644
--- a/rt/lib/RT/Search/UnrepliedTickets.pm
+++ b/rt/lib/RT/Search/UnrepliedTickets.pm
@@ -30,28 +30,39 @@ sub Prepare  {
   my $self = shift;
 
   my $TicketsObj = $self->TicketsObj;
-  $TicketsObj->Limit(
+  # bypass the pre-RT-4.2 TicketRestrictions stuff and just use SearchBuilder
+  $TicketsObj->RT::SearchBuilder::Limit(
     FIELD => 'Owner',
     VALUE => $TicketsObj->CurrentUser->id
   );
-  $TicketsObj->Limit(
+  $TicketsObj->RT::SearchBuilder::Limit(
     FIELD => 'Status',
     OPERATOR => '!=',
     VALUE => 'resolved'
   );
   my $txn_alias = $TicketsObj->JoinTransactions;
-  $TicketsObj->Limit(
+  $TicketsObj->RT::SearchBuilder::Limit(
     ALIAS => $txn_alias,
     FIELD => 'Created',
     OPERATOR => '>',
     VALUE => 'COALESCE(main.Told,\'1970-01-01\')',
     QUOTEVALUE => 0,
   );
-  $TicketsObj->Limit(
+  $TicketsObj->RT::SearchBuilder::Limit(
     ALIAS => $txn_alias,
     FIELD => 'Type',
-    OPERATOR => 'IN',
-    VALUE => [ 'Correspond', 'Create' ],
+    OPERATOR => '=',
+    VALUE => 'Correspond',
+    SUBCLAUSE => 'transactiontype',
+    ENTRYAGGREGATOR => 'OR',
+  );
+  $TicketsObj->RT::SearchBuilder::Limit(
+    ALIAS => $txn_alias,
+    FIELD => 'Type',
+    OPERATOR => '=',
+    VALUE => 'Create',
+    SUBCLAUSE => 'transactiontype',
+    ENTRYAGGREGATOR => 'OR',
   );
 
   return(1);

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

Summary of changes:
 rt/lib/RT/Search/UnrepliedTickets.pm |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)