diff options
Diffstat (limited to 'rt/html/Ticket/Display.html')
| -rw-r--r-- | rt/html/Ticket/Display.html | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html index 7bdd57f93..ca6939821 100644 --- a/rt/html/Ticket/Display.html +++ b/rt/html/Ticket/Display.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# along with this program; if not, write to the Free Software %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA %# 02110-1301 or visit their web page on the internet at -%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -46,11 +46,11 @@ %# %# END BPS TAGGED BLOCK }}} <& /Elements/Header, - Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &> + Title => loc("Ticket #[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &> <& /Ticket/Elements/Tabs, Ticket => $TicketObj, current_tab => 'Ticket/Display.html?id='.$TicketObj->id, - Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &> + Title => loc("Ticket #[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &> <& /Elements/ListActions, actions => \@Actions &> <& /Elements/Callback, _CallbackName => 'BeforeShowSummary', Ticket => $TicketObj, %ARGS &> @@ -135,10 +135,11 @@ if ($ARGS{'id'} eq 'new') { } $ARGS{'UpdateContent'} =~ s/\r\n/\n/g if defined $ARGS{'UpdateContent'}; - if ( ( defined $ARGS{'UpdateContent'} + if ( $ARGS{'UpdateTimeWorked'} || ( + defined $ARGS{'UpdateContent'} && $ARGS{'UpdateContent'} ne '' && $ARGS{'UpdateContent'} ne "-- \n" - . $session{'CurrentUser'}->UserObj->Signature ) || $session{'Attachments'} ) + . $session{'CurrentUser'}->UserObj->Signature ) ) { $ARGS{UpdateAttachments} = $session{'Attachments'}; ProcessUpdateMessage( @@ -147,9 +148,6 @@ if ($ARGS{'id'} eq 'new') { TicketObj => $TicketObj, ); delete $session{'Attachments'}; - } elsif ( $ARGS{'UpdateTimeWorked'} ) { - # Add UpdateTimeWorked to TimeWorked (processed below with ProcessTicketBasics) - $ARGS{'TimeWorked'} = $TicketObj->TimeWorked + $ARGS{'UpdateTimeWorked'}; } #Process status updates my @PeopleActions = ProcessTicketWatchers(ARGSRef => \%ARGS, TicketObj=>$TicketObj); |