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/Tools/Elements/Tabs | 40 +++++++++++++++-------- rt/html/Tools/MyDay.html | 80 ++++++++++++++++++++++++++++++--------------- rt/html/Tools/Offline.html | 38 ++++++++++----------- 3 files changed, 98 insertions(+), 60 deletions(-) (limited to 'rt/html/Tools') diff --git a/rt/html/Tools/Elements/Tabs b/rt/html/Tools/Elements/Tabs index fc4153b98..cd6d16916 100644 --- a/rt/html/Tools/Elements/Tabs +++ b/rt/html/Tools/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: @@ -45,25 +47,35 @@ %# END BPS TAGGED BLOCK }}} <& /Elements/Tabs, tabs => $tabs, - current_toptab => 'Tools/Offline.html', + current_toptab => 'Tools/index.html', current_tab => $current_tab, Title => $Title &> <%INIT> - my $tabs = { a => { title => loc('Offline'), - path => 'Tools/Offline.html', - }, - }; +my $tabs = { + a => { + title => loc('Offline'), + path => 'Tools/Offline.html', + }, + b => { + title => loc('Reports'), + path => 'Tools/Reports/index.html', + }, + c => { + title => loc('My Day'), + path => 'Tools/MyDay.html', + }, +}; - foreach my $tab (sort keys %{$tabs}) { - if ($tabs->{$tab}->{'path'} eq $current_tab) { - $tabs->{$tab}->{"subtabs"} = $subtabs; - $tabs->{$tab}->{"current_subtab"} = $current_subtab; +$m->comp('/Elements/Callback', tabs => $tabs, %ARGS); + +foreach my $tab ( sort keys %{$tabs} ) { + if ( $tabs->{$tab}->{'path'} eq $current_tab ) { + $tabs->{$tab}->{"subtabs"} = $subtabs; + $tabs->{$tab}->{"current_subtab"} = $current_subtab; } - } +} - - <%ARGS> $subtabs => undef $current_tab => undef diff --git a/rt/html/Tools/MyDay.html b/rt/html/Tools/MyDay.html index a20209c9b..dbda0f9aa 100644 --- a/rt/html/Tools/MyDay.html +++ b/rt/html/Tools/MyDay.html @@ -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,37 +45,67 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<& /Elements/Header, title => "What I did today" &> -(displaying new and open tickets for <%$session{'CurrentUser'}->Name%>) -
- +<& /Elements/Header, Title => $title &> +<& /Tools/Elements/Tabs, current_tab => "Tools/MyDay.html", Title => $title &> + +<& /Elements/ListActions, actions => \@results &> + +<&|/l, $session{'CurrentUser'}->Name&>(displaying new and open tickets for [_1]) + +
% while ( my $Ticket = $Tickets->Next()) { % my $class; % $i++; % if ($i % 2 ) { % $class = 'class="oddline"'; % } -> -> - -> - - +> +> + +> + + % } -

<%$Ticket->Id%>: -<%$Ticket->Subject%>

Worked: minutes -Comments:
Status: <& /Elements/SelectStatus, Name=> 'UpdateStatus-'.$Ticket->Id, - DefaultLabel => loc("[_1] (Unchanged)",loc($Ticket->Status())) &>

<%$Ticket->Id%>: +<%$Ticket->Subject%>

<&|/l&>Worked: <&|/l&>minutes +<&|/l&>Comments:
<&|/l&>Status: <& /Elements/SelectStatus, Name=> 'UpdateStatus-'.$Ticket->Id, + DefaultLabel => loc("[_1] (Unchanged)",loc($Ticket->Status())) &>
+ <& /Elements/Submit, Label => "Record all updates" , Reset => 'Clear'&> -
- - + + <%INIT> +my $title = loc("What I did today"); my $i = 0; +my @results; +foreach my $arg ( keys %ARGS ) { + next unless ( $arg =~ /^UpdateStatus-(\d*)$/ ); + my $id = $1; + my $ticket = LoadTicket($id); + next unless ( $ticket->id ); + if ( my $content = $ARGS{'UpdateContent-'.$id} ) { + my ( $val, $msg ) = $ticket->Comment( + Content => $content, + TimeTaken => $ARGS{ 'UpdateTimeWorked-' . $id } + ); + push @results, loc( "Ticket [_1]: [_2]", $id, $msg ); + } elsif ( my $worked = $ARGS{ 'UpdateTimeWorked-' . $id } ) { + my ( $val, $msg ) = $ticket->SetTimeWorked( $worked + $ticket->TimeWorked ); + push @results, loc( "Ticket [_1]: [_2]", $id, $msg ); + } + + if ( my $status = $ARGS{ 'UpdateStatus-' . $id } ) { + if ( $status ne $ticket->Status ) { + my ( $val, $msg ) = $ticket->SetStatus($status); + push @results, loc( "Ticket [_1]: [_2]", $id, $msg ); + + } + } + +} my $Tickets = RT::Tickets->new($session{'CurrentUser'}); $Tickets->LimitOwner(VALUE => $session{'CurrentUser'}->Id); @@ -81,11 +113,5 @@ $Tickets->LimitStatus( VALUE => 'open' ); $Tickets->LimitStatus ( VALUE => 'new'); $Tickets->OrderBy ( FIELD => 'Priority', ORDER => 'DESC'); -while (my $Ticket = $Tickets->Next()) { - #Process updates - - -} - diff --git a/rt/html/Tools/Offline.html b/rt/html/Tools/Offline.html index 8b12784e8..385e6add8 100644 --- a/rt/html/Tools/Offline.html +++ b/rt/html/Tools/Offline.html @@ -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: @@ -53,50 +55,48 @@ <& /Elements/Callback, Requestor => \$requestoraddress, Queue => \$qname, %ARGS &> -
+ - - - - -
+ <&|/l&>Default Queue: <& /Elements/SelectQueue, Name => "qname", NamedValues => 1 &> -<&|/l&>If no queue is specified, create tickets in this queue. +<&|/l&>If no queue is specified, create tickets in this queue.
+ <&|/l&>Default Requestor: -> -<&|/l&>If no Requestor is specified, create tickets with this requestor. + +<&|/l&>If no Requestor is specified, create tickets with this requestor.
+
<&|/l&>Template: - + +
+
<&|/l&>Get template from file: - - + +
<& /Elements/Submit, Name => 'UpdateTickets', Label => loc('Upload'), Caption => loc("Upload your changes"), color => "#993333" &> -
+ <%args> -$requestoraddress => undef +$requestoraddress => '' $qname => undef $string => undef -- cgit v1.2.1