[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.4-247-ge5bdaf3

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  e5bdaf333a60d6caae62a88ea0a87078bd7f5c78 (commit)
       via  6f9572aa46b039197797ec07d3b08c31b9c3c9fd (commit)
      from  7b6789d92ffbf7ef73e58eb2ef64f9bfefca7c83 (commit)

Summary of changes:
 share/html/Elements/Tabs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit e5bdaf333a60d6caae62a88ea0a87078bd7f5c78
Merge: 7b6789d 6f9572a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Jan 25 19:13:57 2012 -0500

    Merge branch '4.0/hide-new-ticket-selfservice' into 4.0-trunk
    
    Conflicts:
    	share/html/Elements/Tabs

diff --cc share/html/Elements/Tabs
index 2c98ece,5f75e29..f65f909
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@@ -831,14 -831,14 +831,14 @@@ my $build_selfservice_nav = sub 
      }
  
  
 -    my $tickets = Menu->child( tickets => title => loc('Tickets'));
 -    $tickets->child( open   => title => loc('Open tickets'),   path => '/SelfService/' );
 -    $tickets->child( closed => title => loc('Closed tickets'), path => '/SelfService/Closed.html' );
      if ( $queue_count > 1 ) {
 -        $tickets->child( new => title => loc('New ticket'),    path => '/SelfService/CreateTicketInQueue.html' );
 +        Menu->child( new => title => loc('New ticket'), path => '/SelfService/CreateTicketInQueue.html' );
-     } else {
+     } elsif ( $queue_id ) {
 -        $tickets->child( new => title => loc('New ticket'),    path => '/SelfService/Create.html?Queue=' . $queue_id );
 +        Menu->child( new => title => loc('New ticket'), path => '/SelfService/Create.html?Queue=' . $queue_id );
      }
 +    my $tickets = Menu->child( tickets => title => loc('Tickets'));
 +    $tickets->child( open   => title => loc('Open tickets'),   path => '/SelfService/' );
 +    $tickets->child( closed => title => loc('Closed tickets'), path => '/SelfService/Closed.html' );
  
  
      my $username = '<span class="current-user">'

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