[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.12-55-g524cec7

[Shawn Moore]

The branch, 4.2-trunk has been updated
       via  524cec7e9d85da5af75e6f94c81de9ccfdcb1a82 (commit)
       via  1552895ea7b58847f5e25e9d0a894278a129e7dc (commit)
       via  9a47855f2f7fa45d225d692acde1cc82676c1d1b (commit)
      from  cdf9c9fe4297aebb158e75a0e35faf79b29a32fb (commit)

Summary of changes:
 share/html/Ticket/Elements/ShowRequestor | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 9a47855f2f7fa45d225d692acde1cc82676c1d1b
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 17 20:38:51 2015 +0800

    fix operator precedence because "&&" binds tighter than "="

diff --git a/share/html/Ticket/Elements/ShowRequestor b/share/html/Ticket/Elements/ShowRequestor
index 266604c..e39679a 100644
--- a/share/html/Ticket/Elements/ShowRequestor
+++ b/share/html/Ticket/Elements/ShowRequestor
@@ -167,8 +167,10 @@ $ShowTickets = 0 if $DefaultTicketsTab eq 'None';
 my $TicketTemplate;
 if ($ShowTickets) {
     for (0 .. (@$status_order - 1)) {
-        $selected = $_ && last
-            if $status_order->[$_] eq $DefaultTicketsTab;
+        if ( $status_order->[$_] eq $DefaultTicketsTab ) {
+            $selected = $_;
+            last;
+        }
     }
 
     $TicketTemplate = "ShowRequestorTickets$DefaultTicketsTab";

commit 1552895ea7b58847f5e25e9d0a894278a129e7dc
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 17 20:39:51 2015 +0800

    new version of tabs lib uses option "active" instead of "selected"

diff --git a/share/html/Ticket/Elements/ShowRequestor b/share/html/Ticket/Elements/ShowRequestor
index e39679a..5630efe 100644
--- a/share/html/Ticket/Elements/ShowRequestor
+++ b/share/html/Ticket/Elements/ShowRequestor
@@ -51,7 +51,7 @@
         jQuery(".more-about-requestor-tickets").tabs({
             cache: true,
             collapsible: true,
-            selected: <% $selected %>
+            active: <% $selected %>
         });
     });
 </script>

commit 524cec7e9d85da5af75e6f94c81de9ccfdcb1a82
Merge: cdf9c9f 1552895
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri Oct 2 15:33:44 2015 -0400

    Merge branch '4.2/more-about-requestor-list-default-tab' into 4.2-trunk


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