[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.2-55-g5302477
Alex Vandiver
alexmv at bestpractical.com
Tue Sep 6 17:16:29 EDT 2011
The branch, 4.0-trunk has been updated
via 530247758ffcc8e048f21e38e381bb8a5710814f (commit)
via 5654bd28719f300771dbdfa3d7d25a65d1072117 (commit)
via ffaa3fee23bf9067b8f3fb7f0824a1be7d87560c (commit)
via 4f48386652ae577b71ad4152382d8a230e4bc6ea (commit)
via a5f81f29e6369c0ea89909c702fd64242362c68f (commit)
via d1ba38b5f7c8a96e2febd1af2e1498f8f9ec0751 (commit)
from 96db49416e85c27b25c3692f935054fd98604a6a (commit)
Summary of changes:
lib/RT/Interface/Web.pm | 4 +-
.../Tools/Shredder/Elements/Object/RT--Attachment | 3 +-
share/html/REST/1.0/Forms/ticket/attachments | 3 +-
share/html/REST/1.0/Forms/ticket/history | 3 +-
share/html/REST/1.0/Forms/transaction/default | 3 +-
share/html/Search/Bulk.html | 2 +-
share/html/SelfService/Display.html | 2 +-
share/html/Ticket/Create.html | 2 +-
share/html/Ticket/Elements/ShowAttachments | 2 +-
.../Ticket/Elements/ShowTransactionAttachments | 15 ++++++-----
share/html/Ticket/ModifyAll.html | 2 +-
share/html/Ticket/Update.html | 2 +-
share/html/m/ticket/create | 2 +-
share/html/m/ticket/reply | 2 +-
t/web/attachment-with-name-0.t | 25 ++++++++++++++++++++
15 files changed, 51 insertions(+), 21 deletions(-)
create mode 100644 t/web/attachment-with-name-0.t
- Log -----------------------------------------------------------------
commit 4f48386652ae577b71ad4152382d8a230e4bc6ea
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Sep 6 16:30:57 2011 -0400
Rename test file to a .t, so it is run by "make test"
diff --git a/t/web/attachment-with-name-0 b/t/web/attachment-with-name-0.t
similarity index 100%
rename from t/web/attachment-with-name-0
rename to t/web/attachment-with-name-0.t
commit ffaa3fee23bf9067b8f3fb7f0824a1be7d87560c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Sep 6 16:54:54 2011 -0400
Fix last few ->Filename in boolean context calls
diff --git a/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
index 02ef90b..24d6a25 100644
--- a/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
+++ b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
@@ -48,6 +48,7 @@
<%ARGS>
$Object => undef
</%ARGS>
+% my $name = (defined $a->Filename and length $a->Filename) ? $a->Filename : loc("(no value)");
<a href="<% RT->Config->Get('WebURL') %>/Ticket/Attachment/<% $Object->TransactionId %>/<% $Object->id %>/">
-<% loc('Attachment') %>(<% loc('id') %>:<% $Object->id %>, <% loc('FileName') %>: <% $Object->Filename || loc('(no value)') %>)
+<% loc('Attachment') %>(<% loc('id') %>:<% $Object->id %>, <% loc('FileName') %>: <% $name %>)
</a>
diff --git a/share/html/REST/1.0/Forms/ticket/attachments b/share/html/REST/1.0/Forms/ticket/attachments
index 3d23369..345ac63 100755
--- a/share/html/REST/1.0/Forms/ticket/attachments
+++ b/share/html/REST/1.0/Forms/ticket/attachments
@@ -118,7 +118,8 @@ else {
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)";
}
}
diff --git a/share/html/REST/1.0/Forms/ticket/history b/share/html/REST/1.0/Forms/ticket/history
index d37a68b..da358b8 100755
--- a/share/html/REST/1.0/Forms/ticket/history
+++ b/share/html/REST/1.0/Forms/ticket/history
@@ -151,7 +151,8 @@ if ($tid) {
my $size = length($a->Content||'');
if ($size > 1024) { $size = int($size/102.4)/10 . "k" }
else { $size .= "b" }
- $attachlist .= "\n" . $a->Id.": ".($a->Filename || "untitled")." (".$size.")";
+ my $name = (defined $a->Filename and length $a->Filename) ? $a->Filename : "untitled";
+ $attachlist .= "\n" . $a->Id.": $name ($size)";
}
push @data, [Attachments => $attachlist];
diff --git a/share/html/REST/1.0/Forms/transaction/default b/share/html/REST/1.0/Forms/transaction/default
index cc706c7..75613a8 100644
--- a/share/html/REST/1.0/Forms/transaction/default
+++ b/share/html/REST/1.0/Forms/transaction/default
@@ -107,7 +107,8 @@ if ($tid) {
else {
$size .= "b";
}
- $attachlist .= "\n" . $a->Id.": ".($a->Filename || "untitled")." (".$size.")";
+ my $name = (defined $a->Filename and length $a->Filename) ? $a->Filename : "untitled";
+ $attachlist .= "\n" . $a->Id.": $name ($size)";
}
push @data, [Attachments => $attachlist];
}
commit 5654bd28719f300771dbdfa3d7d25a65d1072117
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Sep 6 16:55:14 2011 -0400
Use the canonical casing of Filename we use elsewhere
diff --git a/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
index 24d6a25..c51c7a8 100644
--- a/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
+++ b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
@@ -50,5 +50,5 @@ $Object => undef
</%ARGS>
% my $name = (defined $a->Filename and length $a->Filename) ? $a->Filename : loc("(no value)");
<a href="<% RT->Config->Get('WebURL') %>/Ticket/Attachment/<% $Object->TransactionId %>/<% $Object->id %>/">
-<% loc('Attachment') %>(<% loc('id') %>:<% $Object->id %>, <% loc('FileName') %>: <% $name %>)
+<% loc('Attachment') %>(<% loc('id') %>:<% $Object->id %>, <% loc('Filename') %>: <% $name %>)
</a>
commit 530247758ffcc8e048f21e38e381bb8a5710814f
Merge: 96db494 5654bd2
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Sep 6 17:02:49 2011 -0400
Merge branch '4.0/attachment-with-name-0' into 4.0-trunk
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list