Skip to content

Commit 64c3d9b

Browse files
committed
Migrate to default queue select in RTIR query builder
As we added support to filter RTIR queues in default queue select, the old SelectRTIRQueue that was only used in query builder is not needed any more.
1 parent 896026d commit 64c3d9b

3 files changed

Lines changed: 2 additions & 166 deletions

File tree

html/Callbacks/RTIR/Elements/SelectObject/ModifyObjects

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<%INIT>
4949
if ( $ARGSRef->{ObjectType} eq 'Queue' ) {
5050
my $url = RT::Interface::Web::RequestENV('HTTP_HX_CURRENT_URL') || RT::Interface::Web::RequestENV('REQUEST_URI');
51-
if ( $url =~ m{/RTIR/} ) {
51+
if ( $DECODED_ARGS->{RTIR} || $url =~ m{/RTIR/} ) {
5252
@$Objects = grep { RT::IR->OurLifecycle( $_->{Lifecycle} ) } @$Objects;
5353

5454
my $constituency;

html/Callbacks/RTIR/Search/Elements/PickBasics/Default

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,7 @@
4949
return unless $DECODED_ARGS->{RTIR};
5050

5151
foreach( @$Conditions ) {
52-
if (($_->{'Name'}||'') eq 'Queue' ) {
53-
$_->{'Value'}{'Path'} = '/RTIR/Elements/SelectRTIRQueue';
54-
$_->{'Value'}{'Arguments'}{'ShowNullOption'} = 1;
55-
if (defined $m->{'RTIR_ConstituencyFilter'}) {
56-
$_->{'Value'}{'Arguments'}{'Constituency'} = $m->{'RTIR_ConstituencyFilter'};
57-
$_->{'Value'}{'Arguments'}{'LimitToConstituency'} = 1;
58-
if (defined $m->request_args->{'Lifecycle'}) {
59-
$_->{'Value'}{'Arguments'}{'Lifecycle'} = $m->request_args->{'Lifecycle'};
60-
}
61-
}}
62-
elsif (($_->{'Name'}||'') eq 'Status' ) {
52+
if (($_->{'Name'}||'') eq 'Status' ) {
6353
$_->{'Value'}{'Path'} = '/Ticket/Elements/SelectStatus';
6454
if (!defined $_{'Value'}{'Queues'} && defined $m->request_args->{'Lifecycle'}){
6555
$_->{'Value'}{'Arguments'}{'Lifecycles'} =

html/RTIR/Elements/SelectRTIRQueue

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)