projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update address standardization for cust_location changes
[freeside.git]
/
rt
/
share
/
html
/
REST
/
1.0
/
Forms
/
ticket
/
attachments
diff --git
a/rt/share/html/REST/1.0/Forms/ticket/attachments
b/rt/share/html/REST/1.0/Forms/ticket/attachments
index
ac14161
..
43b8ed8
100755
(executable)
--- a/
rt/share/html/REST/1.0/Forms/ticket/attachments
+++ b/
rt/share/html/REST/1.0/Forms/ticket/attachments
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-54,7
+54,7
@@
$args => undef
<%INIT>
my @data;
my ($c, $o, $k, $e) = ("", [], {}, "");
<%INIT>
my @data;
my ($c, $o, $k, $e) = ("", [], {}, "");
-my $ticket =
new RT::Ticket $session{CurrentUser}
;
+my $ticket =
RT::Ticket->new($session{CurrentUser})
;
$ticket->Load($id);
unless ($ticket->Id) {
$ticket->Load($id);
unless ($ticket->Id) {
@@
-76,7
+76,7
@@
if ($aid) {
unless ($aid =~ /^\d+$/) {
return [ "# Invalid attachment id: $aid", [], {}, 1 ];
}
unless ($aid =~ /^\d+$/) {
return [ "# Invalid attachment id: $aid", [], {}, 1 ];
}
- my $attachment =
new RT::Attachment $session{CurrentUser}
;
+ my $attachment =
RT::Attachment->new($session{CurrentUser})
;
$attachment->Load($aid);
unless ($attachment->Id eq $aid) {
return [ "# Invalid attachment id: $aid", [], {}, 1 ];
$attachment->Load($aid);
unless ($attachment->Id eq $aid) {
return [ "# Invalid attachment id: $aid", [], {}, 1 ];
@@
-118,7
+118,8
@@
else {
my $size = length($a->Content || '');
if ($size > 1024) { $size = int($size/102.4)/10 . "k" }
else { $size .= "b" }
my $size = length($a->Content || '');
if ($size > 1024) { $size = int($size/102.4)/10 . "k" }
else { $size .= "b" }
- push @attachments, $a->Id.": ".($a->Filename || '(Unnamed)')." (".$a->ContentType . " / ".$size.")";
+ my $name = (defined $a->Filename and length $a->Filename) ? $a->Filename : "(Unnamed)";
+ push @attachments, $a->Id.": $name (".$a->ContentType . " / $size)";
}
}
}
}