[Rt-commit] rtir branch, 5.0/rtir-default-queue, repushed

[Jim Brandt]

The branch 5.0/rtir-default-queue was deleted and repushed:
       was a608e6b36435a1902dbb6346c322794998313f5b
       now 34bd4f10df0085a4e9bea2bbb2c0da25b9920727

1: a608e6b3 ! 1: e7cea72f Add RTIR_DefaultQueue option
    @@ -14,10 +14,6 @@
     --- a/etc/RTIR_Config.pm
     +++ b/etc/RTIR_Config.pm
     @@
    - 
    - my $default_queue = RT->Config->Get('DefaultQueue');
    - unless (defined $default_queue) {
    -+    push @RT::Config::PreInitLoggerMessages, 'Setting default queue to Incident Reports from the RTIR configuration. Set a different $DefaultQueue value in RT to override.';
          RT->Config->Set('DefaultQueue','Incident Reports');
      }
      
    @@ -47,24 +43,52 @@
      # Use default queue from config site or user prefs if none provided
      unless ($Queue) {
     -    $Queue = GetDefaultQueue();
    -+    $Queue = GetRTIRDefaultQueue();
    ++    $Queue = RT::IR::GetRTIRDefaultQueue();
      }
      
      # pick first in list in normal order unless queue provided from form/url/defaults
    +
    +diff --git a/html/RTIR/Elements/SelectNewTicketQueue b/html/RTIR/Elements/SelectNewTicketQueue
    +--- a/html/RTIR/Elements/SelectNewTicketQueue
    ++++ b/html/RTIR/Elements/SelectNewTicketQueue
    +@@
    +  &>
    + </label>
    + <%INIT>
    +-my $queue = RT->Config->Get("DefaultQueue", $session{'CurrentUser'});
    +-
    +-if (RT->Config->Get("RememberDefaultQueue", $session{'CurrentUser'})) {
    +-    if (my $session_default = $session{'DefaultQueue'}) {
    +-        $queue = $session_default;
    +-    }
    +-}
    ++my $queue = RT::IR::GetRTIRDefaultQueue();
    + 
    + $m->callback(Queue => \$queue, CallbackName => 'DefaultQueue');
    + </%INIT>
     
     diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
     --- 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 => $ARGS{Queue}, AutoSubmit => 1, ShowNullOption => 0 &>
    ++      <& /RTIR/Elements/SelectRTIRQueue, Name => "Queue", Default => $queue, AutoSubmit => 1, ShowNullOption => 0 &>
    +     </div>
    +   </div>
    +   <div class="form-row">
    +@@
              last;
      }
      
     +my $queue;
    -+if ( $ARGS{'Queue'} ) {
    ++if ( exists $ARGS{'Queue'} ) {
     +    $queue = $ARGS{'Queue'};
     +}
     +else {
    -+    $queue = GetRTIRDefaultQueue();
    ++    $queue = RT::IR::GetRTIRDefaultQueue();
     +}
      
      my $QueueObj = RT::Queue->new($session{'CurrentUser'});
    @@ -161,3 +185,4 @@
              'RTIR_HomepageComponents' => {
                  Type => 'ARRAY',
              },
    +
-:  ------- > 2: 34bd4f10 Remove default setting of DefaultQueue for RT