[Rt-commit] rtir branch, 5.0/restore-incidents-and-investigations-on-create, repushed

[Aaron Trevena]

The branch 5.0/restore-incidents-and-investigations-on-create was deleted and repushed:
       was 2f835fb3573c16db7b69f3dd2895a36fe853a0fd
       now 81ddc5076047340ce3cf2ffc68a807d0bec874f7

1: fb4aafbe = 1: fb4aafbe Core RT::Extension::CreateIncidentAndInvestigation
2: 6b6ff8c1 = 2: 6b6ff8c1 Migrate Investigation/Elements/Create to elevator themes
3: 7ac8ea18 = 3: 7ac8ea18 Replace Cc and AdminCc helper text with tooltips
4: 3b7f1ed8 = 4: 3b7f1ed8 Add DefaultInvestigationsQueue RTIR config option
5: a314f50a = 5: a314f50a Allow investigation queue to be selected
6: b80d086c = 6: b80d086c Use DefaultInvestigationsQueue on incident create
7: 2f835fb3 ! 7: 81ddc507 Reinstate "Incident"/"Launch Investigation" page menu
    @@ -4,6 +4,26 @@
         
         Reinstated tabbed switching view between incident and investigation
         Fixed passing results to FilterRTAddresses as array when should be arrayref
    +
    +diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
    +--- a/etc/RTIR_Config.pm
    ++++ b/etc/RTIR_Config.pm
    +@@
    +     RT->Config->Set('DefaultQueue','Incident Reports');
    + }
    + 
    +-=item C<$DefaultInvestigationsQueue>
    +-
    +-By default, investigation tickets will be created in the Investigations queue.
    +-You can set a different default investigations queue using this configuration
    +-option in RTIR_SiteConfig.pm.
    +-
    +-    Set( $DefaultInvestigationsQueue, 'Special Investigations' );
    +-
    +-=cut
    + 
    + =back
    + 
     
     diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
     --- a/html/RTIR/Incident/Create.html
    @@ -16,6 +36,20 @@
      &>
      <& /Elements/Tabs &>
      
    +@@
    +  }
    + 
    + # Load appropriate Investigations queue
    +-my $InvestigationsQueue = $ARGS{InvestigationQueue} || RT->Config->Get('DefaultInvestigationsQueue') || 'Investigations' . ( $constituency ? ' - ' . $constituency : '' );
    ++my $InvestigationsQueue = $ARGS{InvestigationQueue} || 'Investigations' . ( $constituency ? ' - ' . $constituency : '' );
    + my $InvestigationsQueueObj = RT::Queue->new( $session{'CurrentUser'} );
    + $InvestigationsQueueObj->Load( $InvestigationsQueue );
    + 
    +-# Users limited by constituency may not be able to use the queue defined in DefaultInvestigationsQueue.
    ++# Users limited by constituency may not be able to use the default or specified investigations queue
    + # Look up what queue the user has SeeQueue and CreateTicket for and use that instead.
    + unless ( $InvestigationsQueueObj->Name ) {
    +     RT->Logger->debug( "Investigation Queue '$InvestigationsQueue' could not be loaded for user " . $session{'CurrentUser'}->Id . "." );
     @@
                      InvestigationCc => 'Cc',
                      InvestigationAdminCc => 'AdminCc',