[Bps-public-commit] RT-BugTracker branch, rt4, updated. 58c7031bee519c215b022078e9b654affcbb208d

[? sunnavy]

The branch, rt4 has been updated
       via  58c7031bee519c215b022078e9b654affcbb208d (commit)
       via  07ba6a130bebb709a97660dd2d4766dc4027c241 (commit)
      from  426a0dc5964988648e24ff13b0d2f790adee0c02 (commit)

Summary of changes:
 html/Callbacks/BugTracker/Elements/Tabs/SelfService |   10 ++++++++--
 html/Dist/Display.html                              |    7 +------
 html/Dist/Elements/ErrorDisabled                    |    5 +----
 html/Dist/Manage.html                               |    7 +------
 4 files changed, 11 insertions(+), 18 deletions(-)

- Log -----------------------------------------------------------------
commit 07ba6a130bebb709a97660dd2d4766dc4027c241
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Jun 4 23:42:32 2012 +0800

    cleanup

diff --git a/html/Dist/Display.html b/html/Dist/Display.html
index f372d77..78edcec 100755
--- a/html/Dist/Display.html
+++ b/html/Dist/Display.html
@@ -50,12 +50,7 @@
     RSSAutoDiscovery => $RSSFeedURL,
 &>
 
-<& /Elements/Tabs, 
-    current_tab => '/Dist/Display.html',
-    current_subtab => $current_subtab,
-    Queue => $Name,
-    Title => $title,
-&>
+<& /Elements/Tabs &>
 
 <& /Dist/Elements/ShowNotes, Queue => $QueueObj &>
 
diff --git a/html/Dist/Elements/ErrorDisabled b/html/Dist/Elements/ErrorDisabled
index 7a8d5d0..f40cb63 100644
--- a/html/Dist/Elements/ErrorDisabled
+++ b/html/Dist/Elements/ErrorDisabled
@@ -1,9 +1,6 @@
 <& /Dist/Elements/Header, Title => loc("Error") &>
 
-<& /Elements/Tabs,
-    Title       => loc("Queue for the distribution is disabled"),
-    current_tab => '',
-&>
+<& /Elements/Tabs &>
 
 <& /Dist/Elements/ShowNotes, Queue => $Queue &>
 
diff --git a/html/Dist/Manage.html b/html/Dist/Manage.html
index 8c3e155..725afcb 100644
--- a/html/Dist/Manage.html
+++ b/html/Dist/Manage.html
@@ -2,12 +2,7 @@
     Title => $title,
 &>
 
-<& /Elements/Tabs, 
-    current_tab => '/Dist/Manage.html',
-    current_subtab => $current_subtab,
-    Queue => $Name,
-    Title => $title,
-&>
+<& /Elements/Tabs &>
 
 <& /Elements/ListActions, actions => \@results &>
 

commit 58c7031bee519c215b022078e9b654affcbb208d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Jun 4 23:43:11 2012 +0800

    from comments: Name has higher precendance

diff --git a/html/Callbacks/BugTracker/Elements/Tabs/SelfService b/html/Callbacks/BugTracker/Elements/Tabs/SelfService
index 8dc5f01..d810c5c 100644
--- a/html/Callbacks/BugTracker/Elements/Tabs/SelfService
+++ b/html/Callbacks/BugTracker/Elements/Tabs/SelfService
@@ -72,8 +72,14 @@ $tracker->child(
 
 my $request_path = $HTML::Mason::Commands::r->path_info;
 $request_path =~ s!^/{2,}!/!;
-if ( $request_path =~ /^\/Dist/ ) {
-    my $Queue = $DECODED_ARGS->{'Queue'} || $DECODED_ARGS->{'Name'};
+if ( $request_path =~ m{^/Dist} ) {
+    my $Queue;
+    if ( $request_path !~ m{^/Dist/ByMaintainer\.html} ) {
+        $Queue = $DECODED_ARGS->{'Name'};
+    }
+
+    $Queue ||= $DECODED_ARGS->{'Queue'};
+
     my $queue_obj;
     if ($Queue) {
         my $tmp = RT::Queue->new( $session{'CurrentUser'} );

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