[Rt-commit] rtir branch, 4.2/restore-previous-menu-2, repushed

[Blaine Motsinger]

The branch 4.2/restore-previous-menu-2 was deleted and repushed:
       was ee5365eeb3bd124bfd0361705cd7c781349c79fc
       now 3a26a4e9e2529b2fba852e89554d19999b84fd1b

 1: 9c64af32 =  1: 9c64af32 Restore RTIR menu into single parent
 2: 39a3da54 =  2: 39a3da54 Align menu item with queue name for Incident Reports
 3: 520265b9 =  3: 520265b9 Explain menu change in UPGRADING doc
 4: 56765d4e =  4: 56765d4e Load incident create page without a queue
 5: db1ca1c6 =  5: db1ca1c6 Link directly to create pages in menus
 6: 62f0065f =  6: 62f0065f Update tests to find links after menu updates
 7: d8d63ae7 =  7: d8d63ae7 Link directly to updated create page rather than modal
 8: e8c54449 =  8: e8c54449 Fix form name for creating tickets in tests
 9: 737e6174 =  9: 737e6174 Remove unneeded method call to fix tests
10: 3d0fbecb = 10: 3d0fbecb Fix test regex for file link names
11: 578343e7 = 11: 578343e7 Remove CreateInQueue modal element and JS
12: 92ae79de = 12: 92ae79de Add deprecated warning to CreateInQueue.html
13: 7a2d4894 ! 13: 38100fcd Fix default queue on create pages
    @@ -1,30 +1,18 @@
     Author: Blaine Motsinger <blaine at bestpractical.com>
     
    -    Fix default queue and queue select on create pages
    +    Fix default queue on create pages
         
    -    If the Queue arg is not defined, RT's GetDefaultQueue sub was
    -    returning a queue not correctly scoped to the current user which
    -    lead to an Abort for unable to load queue.
    +    If the Queue arg is not defined, RT's GetDefaultQueue sub returns
    +    a queue not correctly scoped to the current user which leads to an
    +    Abort for unable to load queue.
         
         This commit modifies the Create.html pages to get a default queue
         limited to the Lifecycle arg or RTIR Lifecycles for the current
         user.
    -    
    -    This commit also modifies the SelectRTIRQueue dropdown to limit
    -    based on constituency.
     
     diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
     --- a/html/RTIR/Create.html
     +++ b/html/RTIR/Create.html
    -@@
    -                 Default        => $Queue,
    -                 ShowNullOption => 0,
    -                 AutoSubmit     => 1,
    -+                LimitToConstituency => (( $constituency || RT::IR->StrictConstituencyLinking ) ? 1 : 0 ),
    -+                Constituency   => $constituency,
    -             },
    -         },
    -         {
     @@
      # Make sure even a single checkbox value becomes an arrayref
      $ARGS{'SkipNotification'} = \@SkipNotification;
    @@ -95,16 +83,6 @@
     --- a/html/RTIR/Incident/Create.html
     +++ b/html/RTIR/Incident/Create.html
     @@
    -       <&|/l&>Queue</&>:
    -     </div>
    -     <div class="value col-md-9">
    --      <& /RTIR/Elements/SelectRTIRQueue, Name => "Queue", Default => $queue, AutoSubmit => 1, ShowNullOption => 0 &>
    -+      <& /RTIR/Elements/SelectRTIRQueue, Name => "Queue", Default => $queue, AutoSubmit => 1, ShowNullOption => 0,
    -+                                         LimitToConstituency => (( $constituency || RT::IR->StrictConstituencyLinking ) ? 1 : 0 ), Constituency => $constituency, &>
    -     </div>
    -   </div>
    -   <div class="form-row">
    -@@
      # Load the first Incident queue if none is provided
      my $queue = $ARGS{'Queue'};
      unless ( $queue ) {
14: ebf30626 = 14: ba174a19 Update test library to create tickets directly
15: ee5365ee ! 15: 3e879d7a Update test for modal removal
    @@ -349,3 +349,4 @@
     +
     +undef $m;
     +done_testing;
    +
--:  ------- > 16: 3a26a4e9 WIP - Limit SelectRTIRQueue to constituency