[freeside-commits] freeside/rt/share/html/Ticket/Elements BulkLinks, 1.2, 1.2.4.1 ShowSummary, 1.3, 1.3.4.1 ShowTransactionAttachments, 1.3, 1.3.4.1 Tabs, 1.4, 1.4.4.1
Ivan,,,
ivan at wavetail.420.am
Fri Apr 8 16:13:56 PDT 2011
Update of /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements
In directory wavetail.420.am:/tmp/cvs-serv23950/share/html/Ticket/Elements
Modified Files:
Tag: FREESIDE_2_1_BRANCH
BulkLinks ShowSummary ShowTransactionAttachments Tabs
Log Message:
landing 3.8.9 on 2.1 branch for 2.1.3
Index: Tabs
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/Tabs,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -w -d -r1.4 -r1.4.4.1
--- Tabs 29 Jul 2010 03:41:40 -0000 1.4
+++ Tabs 8 Apr 2011 23:13:53 -0000 1.4.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
@@ -197,7 +197,9 @@
if ( $Ticket->Status ne 'resolved' ) {
$actions->{'G'} = {
path =>
- "Ticket/Update.html?Action=Comment&DefaultStatus=resolved&id="
+ "Ticket/Update.html?Action="
+ . RT->Config->Get('ResolveDefaultUpdateType', $session{'CurrentUser'})
+ . "&DefaultStatus=resolved&id="
. $id,
title => loc('Resolve')
};
Index: ShowTransactionAttachments
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/ShowTransactionAttachments,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -w -d -r1.3 -r1.3.4.1
--- ShowTransactionAttachments 18 May 2010 19:20:29 -0000 1.3
+++ ShowTransactionAttachments 8 Apr 2011 23:13:53 -0000 1.3.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
@@ -129,7 +129,7 @@
my $size = shift;
# show a download link
if ( $size > 1024*1024 ) {
- $size = loc( "[_1]b", int( $size / 1024 / 102.4 ) / 10 );
+ $size = loc( "[_1]m", int( $size / 1024 / 102.4 ) / 10 );
}
elsif ( $size > 1024 ) {
$size = loc( "[_1]k", int( $size / 102.4 ) / 10 );
@@ -250,7 +250,7 @@
. $message->Id
. '/" />' );
}
- elsif ( $message->ContentLength > 0 ) {
+ elsif ( $message->ContentLength && $message->ContentLength > 0 ) {
$m->out( '<p>' .
loc( 'Message body not shown because it is not plain text.' ) .
'</p>'
Index: BulkLinks
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/BulkLinks,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -w -d -r1.2 -r1.2.4.1
--- BulkLinks 26 Jul 2010 05:01:23 -0000 1.2
+++ BulkLinks 8 Apr 2011 23:13:53 -0000 1.2.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
@@ -125,31 +125,31 @@
<table>
<tr>
<td class="label"><&|/l&>Merge into</&>:</td>
- <td class="entry"><input name="Ticket-MergeInto" /> <i><&|/l&>(only one ticket)</&></i></td>
+ <td class="entry"><input name="Ticket-MergeInto" value="<% $ARGS{'Ticket-MergeInto'} || '' %>" /> <i><&|/l&>(only one ticket)</&></i></td>
</tr>
<tr>
<td class="label"><&|/l&>Depends on</&>:</td>
- <td class="entry"><input name="Ticket-DependsOn" /></td>
+ <td class="entry"><input name="Ticket-DependsOn" value="<% $ARGS{'Ticket-DependsOn'} || '' %>" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Depended on by</&>:</td>
- <td class="entry"><input name="DependsOn-Ticket" /></td>
+ <td class="entry"><input name="DependsOn-Ticket" value="<% $ARGS{'DependsOn-Ticket'} || '' %>" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Parents</&>:</td>
- <td class="entry"><input name="Ticket-MemberOf" /></td>
+ <td class="entry"><input name="Ticket-MemberOf" value="<% $ARGS{'Ticket-MemberOf'} || '' %>" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Children</&>:</td>
- <td class="entry"> <input name="MemberOf-Ticket" /></td>
+ <td class="entry"> <input name="MemberOf-Ticket" value="<% $ARGS{'MemberOf-Ticket'} || '' %>" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Refers to</&>:</td>
- <td class="entry"><input name="Ticket-RefersTo" /></td>
+ <td class="entry"><input name="Ticket-RefersTo" value="<% $ARGS{'Ticket-RefersTo'} || '' %>" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Referred to by</&>:</td>
- <td class="entry"> <input name="RefersTo-Ticket" /></td>
+ <td class="entry"> <input name="RefersTo-Ticket" value="<% $ARGS{'RefersTo-Ticket'} || '' %>" /></td>
</tr>
</table>
</td>
Index: ShowSummary
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/ShowSummary,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -w -d -r1.3 -r1.3.4.1
--- ShowSummary 18 May 2010 19:20:28 -0000 1.3
+++ ShowSummary 8 Apr 2011 23:13:53 -0000 1.3.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
More information about the freeside-commits
mailing list