From 8103c1fc1b2c27a6855feadf26f91b980a54bc52 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:11:51 +0000 Subject: import rt 3.6.6 --- rt/html/SelfService/Elements/GotoTicket | 8 ++-- rt/html/SelfService/Elements/Header | 6 ++- rt/html/SelfService/Elements/MyRequests | 67 ++++++++++++++++----------------- rt/html/SelfService/Elements/Tabs | 37 ++++++++++++++---- 4 files changed, 72 insertions(+), 46 deletions(-) (limited to 'rt/html/SelfService/Elements') diff --git a/rt/html/SelfService/Elements/GotoTicket b/rt/html/SelfService/Elements/GotoTicket index 50efaa24e..5eac306e9 100644 --- a/rt/html/SelfService/Elements/GotoTicket +++ b/rt/html/SelfService/Elements/GotoTicket @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,4 +45,4 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -
 
+
 
diff --git a/rt/html/SelfService/Elements/Header b/rt/html/SelfService/Elements/Header index c7e6a9167..f248292e2 100644 --- a/rt/html/SelfService/Elements/Header +++ b/rt/html/SelfService/Elements/Header @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/SelfService/Elements/MyRequests b/rt/html/SelfService/Elements/MyRequests index 2df8ce842..41f6b09b1 100644 --- a/rt/html/SelfService/Elements/MyRequests +++ b/rt/html/SelfService/Elements/MyRequests @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,43 +45,40 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<& /Elements/TitleBoxStart, title => $title &> - - - - - - - -% while (my $Ticket = $MyTickets->Next) { - - - -% } -
<&|/l&>Subject<&|/l&>Status<&|/l&>Owner
-<%$Ticket->Id%>: <%$Ticket->Subject%> - -<%loc($Ticket->Status)%> - -<%$Ticket->OwnerObj->Name%> -
-<& /Elements/TitleBoxEnd &> - +<&| /Widgets/TitleBox, title => $title &> +<& /Elements/TicketList, Title => $title, + Format => @Format, + Query => $Query, + Order => $Order, + OrderBy => $OrderBy, + BaseURL => $BaseURL, + Page => $Page &> + <%INIT> -$title ||= loc("My [_1] tickets", $friendly_status); -my $MyTickets; -$MyTickets = new RT::Tickets ($session{'CurrentUser'}); -$MyTickets->LimitWatcher(TYPE => 'Requestor', VALUE => $session{'CurrentUser'}->EmailAddress); -$MyTickets->OrderBy(FIELD => 'id', ORDER => 'ASC'); - -foreach my $status (@status) { - - $MyTickets->LimitStatus(VALUE => $status); +my $id = $session{'CurrentUser'}->id; +my $Query = "( " + . join( ' OR ', map "$_.id = $id", @roles ) + . ")"; +if ( @status ) { + $Query .= " AND ( " + . join( ' OR ', map "Status = '$_'", @status ) + . " )"; } +my $Order = "ASC"; +my $OrderBy = "Created"; +my @Format = qq{ + '__id__/TITLE:#', + '__Subject__/TITLE:Subject', + Status, + Requestors, + OwnerName}; <%ARGS> -$title => undef $friendly_status => loc('open') +$title => loc("My [_1] tickets", $friendly_status) +@roles => ('Watcher') @status => ('open', 'new', 'stalled') +$BaseURL => undef +$Page => 1 diff --git a/rt/html/SelfService/Elements/Tabs b/rt/html/SelfService/Elements/Tabs index 802fd6525..164fa2863 100644 --- a/rt/html/SelfService/Elements/Tabs +++ b/rt/html/SelfService/Elements/Tabs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,6 +45,7 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} +<& /Elements/Callback, tabs => $tabs, %ARGS &> <& /Elements/PageLayout, current_toptab => $current_toptab, current_tab => $current_tab, @@ -52,11 +55,23 @@ &> <%INIT> +my $queues = RT::Queues->new($session{'CurrentUser'}); +$queues->UnLimit; + +my $queue_count = 0; +my $queue_id = 1; + +while (my $queue = $queues->Next) { + next unless $queue->CurrentUserHasRight('CreateTicket'); + $queue_id = $queue->id; + $queue_count++; + last if ($queue_count > 1); +} if ($Title) { -$Title = loc ("RT Self Service") . " / " . $Title; +$Title = loc("RT Self Service") . " / " . $Title; } else { -$Title = loc ("RT Self Service"); +$Title = loc("RT Self Service"); } my ($tab); @@ -66,10 +81,18 @@ my $tabs = { A => { title => loc('Open tickets'), B => { title => loc('Closed tickets'), path => 'SelfService/Closed.html', }, - C => { title => loc('New ticket'), - path => 'SelfService/CreateTicketInQueue.html' - } }; + +if ($queue_count > 1) { + $tabs->{C} = { title => loc('New ticket'), + path => 'SelfService/CreateTicketInQueue.html' + }; +} else { + $tabs->{C} = { title => loc('New ticket'), + path => 'SelfService/Create.html?Queue=' . $queue_id + }; +} + if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) { $tabs->{Z} = { title => loc('Preferences'), -- cgit v1.2.1