[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.6-178-g43a33bb

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  43a33bb0e5d42149bd116e555128244b329f571b (commit)
       via  ce913d5224008ddbc7f218ed7562a744e0ff559f (commit)
       via  745da6954ed2c1bbef07df22c090f69b96c32002 (commit)
      from  8ad6d22aef69445c6b47274a79bf3582c34ed841 (commit)

Summary of changes:
 share/html/Ticket/Elements/ShowRequestor | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 745da6954ed2c1bbef07df22c090f69b96c32002
Author: Christian Loos <cloos at netcologne.de>
Date:   Thu Sep 4 10:20:59 2014 +0200

    make MoreAboutRequestorTicketList None work
    
    Previously the comp_exist check for "ShowRequestorTicketsNone" failed and set
    $TicketTemplate to the default "ShowRequestorTicketsActive".
    Fixing this by treating MoreAboutRequestorTicketList set to None the same way
    as if $ShowTickets where set to a false value.

diff --git a/share/html/Ticket/Elements/ShowRequestor b/share/html/Ticket/Elements/ShowRequestor
index a9f89a1..8d8e7f5 100644
--- a/share/html/Ticket/Elements/ShowRequestor
+++ b/share/html/Ticket/Elements/ShowRequestor
@@ -162,6 +162,8 @@ my $status_link_text = {Active   => loc('Active Tickets'),
 my $status_order = [qw/Active Inactive All/];
 $m->callback( CallbackName => 'AddStatus', status_link_text => \$status_link_text, status_order => \$status_order );
 
+$ShowTickets = 0 if $DefaultTicketsTab eq 'None';
+
 unless ( $DefaultTicketsTab eq 'None' ) {
     for (0 .. (@$status_order - 1)) {
         $selected = $_ && last

commit ce913d5224008ddbc7f218ed7562a744e0ff559f
Author: Christian Loos <cloos at netcologne.de>
Date:   Thu Sep 4 10:46:39 2014 +0200

    don't sort status and lookup a component if we don't need it
    
    If we know we are not showing any requestor tickets there is no need for status
    sorting and component lookups.

diff --git a/share/html/Ticket/Elements/ShowRequestor b/share/html/Ticket/Elements/ShowRequestor
index 8d8e7f5..5bfa0f9 100644
--- a/share/html/Ticket/Elements/ShowRequestor
+++ b/share/html/Ticket/Elements/ShowRequestor
@@ -164,17 +164,18 @@ $m->callback( CallbackName => 'AddStatus', status_link_text => \$status_link_tex
 
 $ShowTickets = 0 if $DefaultTicketsTab eq 'None';
 
-unless ( $DefaultTicketsTab eq 'None' ) {
+my $TicketTemplate;
+if ($ShowTickets) {
     for (0 .. (@$status_order - 1)) {
         $selected = $_ && last
             if $status_order->[$_] eq $DefaultTicketsTab;
     }
-}
 
-my $TicketTemplate = "ShowRequestorTickets$DefaultTicketsTab";
-$TicketTemplate = "ShowRequestorTicketsActive"
-    unless RT::Interface::Web->ComponentPathIsSafe($TicketTemplate)
-       and $m->comp_exists($TicketTemplate);
+    $TicketTemplate = "ShowRequestorTickets$DefaultTicketsTab";
+    $TicketTemplate = "ShowRequestorTicketsActive"
+        unless RT::Interface::Web->ComponentPathIsSafe($TicketTemplate)
+            and $m->comp_exists($TicketTemplate);
+}
 </%INIT>
 <%ARGS>
 $Ticket=>undef

commit 43a33bb0e5d42149bd116e555128244b329f571b
Merge: 8ad6d22 ce913d5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Sep 9 11:40:10 2014 -0400

    Merge branch '4.2/more-about-requestor-tickets' into 4.2-trunk


-----------------------------------------------------------------------