[Rt-commit] rtir branch, 5.0/migrate-to-rt-search, repushed

[? sunnavy]

The branch 5.0/migrate-to-rt-search was deleted and repushed:
       was 950b951de226eaf24211a0b5a07a471dcbc74140
       now 6c975f66c67cb4d197045021e8ba60869eed3259

1: 435a21fb = 1: a14a438e Check lifecycles to identify if it's an RTIR search or not
2: 0f2b0fab = 2: 110afa8d Migrate to RT Lifecycle select
3: 811e6651 ! 3: 0c779a6a Migrate to RT search to reduce code duplication
    @@ -5,18 +5,6 @@
     diff --git a/html/Callbacks/RTIR/Elements/Tabs/Privileged b/html/Callbacks/RTIR/Elements/Tabs/Privileged
     --- a/html/Callbacks/RTIR/Elements/Tabs/Privileged
     +++ b/html/Callbacks/RTIR/Elements/Tabs/Privileged
    -@@
    - %# END BPS TAGGED BLOCK }}}
    - <%INIT>
    - 
    --if ( $m->request_comp->path !~ m{^/RTIR/} ) {
    --    Menu()->child( rtir => title => loc('RTIR'), path => RT::IR->HREFTo('', IncludeWebPath => 0) );
    --    return;
    --}
    --
    - my $query_string = sub {
    -     my %args = @_;
    -     my $u    = URI->new();
     @@
      
      my $args = $DECODED_ARGS;
    @@ -92,18 +80,9 @@
     +    }
     +}
     +
    -+if ( $m->request_comp->path !~ m{^/RTIR/} ) {
    -+    my $rtir = Menu()->child( rtir => title => loc('RTIR'), path => RT::IR->HREFTo('', IncludeWebPath => 0) );
    -+    $rtir->child( new_search => title => loc( 'New Search' ), path => '/Search/Build.html?NewQuery=1&ExtraQueryParams=RTIR&RTIR=1', );
    -+    return;
    -+}
    - 
    - my $orig_menu = Menu();
    - 
    -@@
    - my $root = Menu();
    - 
    - my $search = $root->child( search => title => loc('RTIR'), path => RT::IR->HREFTo('', IncludeWebPath => 0) );
    + my $root = Menu->child( rtir => title => loc('RTIR'), path => '/RTIR/' );
    + 
    + my $search = $root->child( search => title => loc('Search'), path => RT::IR->HREFTo('', IncludeWebPath => 0) );
     -$search->child( new => title => loc('New Search'), path => RT::IR->HREFTo('Search/?NewQuery=1', IncludeWebPath => 0) );
     +$search->child( new => title => loc('New Search'), path => '/Search/Build.html?NewQuery=1&ExtraQueryParams=RTIR&RTIR=1' );
      
    @@ -134,15 +113,15 @@
     +    path => '/Search/Results.html?ExtraQueryParams=RTIR&RTIR=1&Lifecycle='.RT::IR->lifecycle_incident,
      )->child(
          create => title => loc('Create'),
    -     path => RT::IR->HREFTo('CreateInQueue.html?Lifecycle='.RT::IR->lifecycle_incident, IncludeWebPath => 0),
    +     path => RT::IR->HREFTo('Incident/Create.html?Lifecycle='.RT::IR->lifecycle_incident, IncludeWebPath => 0),
      );
      $root->child(
    -     reports => title => loc('Reports'),
    +     reports => title => loc('Incident Reports'),
     -    path => RT::IR->HREFTo('Search/Results.html?Lifecycle='. RT::IR->lifecycle_report, IncludeWebPath => 0)
     +    path => '/Search/Results.html?ExtraQueryParams=RTIR&RTIR=1&Lifecycle='. RT::IR->lifecycle_report,
      )->child(
          create => title => loc('Create'),
    -     path => RT::IR->HREFTo('CreateInQueue.html?Lifecycle='. RT::IR->lifecycle_report, IncludeWebPath => 0),
    +     path => RT::IR->HREFTo('Create.html?Lifecycle='.RT::IR->lifecycle_report, IncludeWebPath => 0),
      );
      $root->child(
          investigations => title => loc('Investigations'),
    @@ -150,7 +129,7 @@
     +    path => '/Search/Results.html?ExtraQueryParams=RTIR&RTIR=1&Lifecycle='.RT::IR->lifecycle_investigation,
      )->child(
          launch => title => loc('Launch'),
    -     path => RT::IR->HREFTo('CreateInQueue.html?Lifecycle='.RT::IR->lifecycle_investigation, IncludeWebPath => 0),
    +     path => RT::IR->HREFTo('Create.html?Lifecycle='.RT::IR->lifecycle_investigation, IncludeWebPath => 0),
     @@
      unless ( RT->Config->Get('RTIR_DisableCountermeasures') ) {
          $root->child(
    @@ -159,7 +138,7 @@
     +        path => '/Search/Results.html?ExtraQueryParams=RTIR&RTIR=1&Lifecycle='.RT::IR->lifecycle_countermeasure,
          )->child(
              create => title => loc('Create'),
    -         path => RT::IR->HREFTo('CreateInQueue.html?Lifecycle='.RT::IR->lifecycle_countermeasure, IncludeWebPath => 0),
    +         path => RT::IR->HREFTo('Create.html?Lifecycle='.RT::IR->lifecycle_countermeasure, IncludeWebPath => 0),
     @@
              $search_arguments->(),
              id => $id,
4: ee020a8e < -:  ------- Update tests accordingly as we migrated to RT search
-:  ------- > 4: 5c81bb56 Update tests accordingly as we switched to RT search
5: 950b951d = 5: 6c975f66 Drop "New Search" from search page menu