[Rt-commit] rt branch, 4.0/oracle-fixes, updated. rt-3.9.7-1137-gcce97d6
Ruslan Zakirov
ruz at bestpractical.com
Thu Dec 30 05:36:27 EST 2010
The branch, 4.0/oracle-fixes has been updated
via cce97d6f339de00451dbb145a710bd3d3c9244fa (commit)
via acb7613b16fe73caf119cc9b7096d63935fc7f5b (commit)
from 946da7ceddf6009c1cc5df6998f17b39d271d98a (commit)
Summary of changes:
etc/initialdata | 2 +-
lib/RT/Group.pm | 10 +++-------
lib/RT/Interface/Web.pm | 2 +-
lib/RT/Test.pm | 2 +-
share/html/Admin/Elements/EditCustomFieldValues | 2 +-
share/html/Elements/ShowLink | 3 ++-
share/html/Ticket/Display.html | 2 +-
share/html/Ticket/Update.html | 4 ++--
8 files changed, 12 insertions(+), 15 deletions(-)
- Log -----------------------------------------------------------------
commit acb7613b16fe73caf119cc9b7096d63935fc7f5b
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Thu Dec 30 13:33:21 2010 +0300
email addresses are unique, however can be empty
diff --git a/lib/RT/Group.pm b/lib/RT/Group.pm
index 5ecc3de..e61b5fe 100644
--- a/lib/RT/Group.pm
+++ b/lib/RT/Group.pm
@@ -836,13 +836,9 @@ Returns an array of the email addresses of all of this group's members
sub MemberEmailAddresses {
my $self = shift;
-
- my %addresses;
- my $members = $self->UserMembersObj();
- while (my $member = $members->Next) {
- $addresses{$member->EmailAddress} = 1;
- }
- return(sort keys %addresses);
+ return sort grep defined && length,
+ map $_->EmailAddress,
+ @{ $self->UserMembersObj->ItemsArrayRef };
}
commit cce97d6f339de00451dbb145a710bd3d3c9244fa
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Thu Dec 30 13:35:04 2010 +0300
get rid of uninit warnings (Oracle specific)
All tests successful.
Test Summary Report
-------------------
t/api/i18n_guess.t (Wstat: 0 Tests: 9 Failed: 0)
TODO passed: 5
Files=202, Tests=11395, 5420 wallclock secs ( 5.39 usr 1.96 sys + 1667.86 cusr 201.87 csys = 1877.08 CPU)
Result: PASS
diff --git a/etc/initialdata b/etc/initialdata
index 82e0fb0..d677d06 100755
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -270,7 +270,7 @@ you may reply to this message.
Name => 'Admin Comment', # loc
Description => 'Default admin comment template', # loc
Content =>
-'Subject: [Comment] {my $s=($Transaction->Subject||$Ticket->Subject); $s =~ s/\\[Comment\\]\\s*//g; $s =~ s/^Re:\\s*//i; $s;}
+'Subject: [Comment] {my $s=($Transaction->Subject||$Ticket->Subject||""); $s =~ s/\\[Comment\\]\\s*//g; $s =~ s/^Re:\\s*//i; $s;}
RT-Attach-Message: yes
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index bd5b1fb..4744dc8 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1383,7 +1383,7 @@ sub ProcessUpdateMessage {
return;
}
- if ( $args{ARGSRef}->{'UpdateSubject'} eq $args{'TicketObj'}->Subject ) {
+ if ( $args{ARGSRef}->{'UpdateSubject'} eq ($args{'TicketObj'}->Subject || '') ) {
$args{ARGSRef}->{'UpdateSubject'} = undef;
}
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 2833b90..d0d465e 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -586,7 +586,7 @@ sub load_or_create_queue {
my @fields = qw(CorrespondAddress CommentAddress);
foreach my $field ( @fields ) {
next unless exists $args{ $field };
- next if $args{ $field } eq $obj->$field;
+ next if $args{ $field } eq ($obj->$field || '');
no warnings 'uninitialized';
my $method = 'Set'. $field;
diff --git a/share/html/Admin/Elements/EditCustomFieldValues b/share/html/Admin/Elements/EditCustomFieldValues
index ad04339..b5e2c30 100755
--- a/share/html/Admin/Elements/EditCustomFieldValues
+++ b/share/html/Admin/Elements/EditCustomFieldValues
@@ -68,7 +68,7 @@
<td><input type="checkbox" class="checkbox" name="Delete-<% $paramtag %>" /></td>
<td><input type="text" size="3" name="<% $paramtag %>-SortOrder" value="<% $value->SortOrder %>" /></td>
<td><input type="text" size="25" name="<% $paramtag %>-Name" value="<% $value->Name %>" /></td>
-<td><input type="text" size="45" name="<% $paramtag %>-Description" value="<% $value->Description %>" /></td>
+<td><input type="text" size="45" name="<% $paramtag %>-Description" value="<% $value->Description || '' %>" /></td>
% if ( $CustomField->Type ne 'Combobox' ) {
<td>
% if ( $Categories ) {
diff --git a/share/html/Elements/ShowLink b/share/html/Elements/ShowLink
index 8ca03ee..5221d69 100644
--- a/share/html/Elements/ShowLink
+++ b/share/html/Elements/ShowLink
@@ -52,7 +52,8 @@
% my $inactive = $member->QueueObj->IsInactiveStatus($member->Status);
<span class="<% $inactive ? 'ticket-inactive' : '' %>">
-<%$member->Id%>: (<& /Elements/ShowUser, User => $member->OwnerObj &>) <%$member->Subject%> [<% loc($member->Status) %>]
+
+<%$member->Id%>: (<& /Elements/ShowUser, User => $member->OwnerObj &>) <%$member->Subject || ''%> [<% loc($member->Status) %>]
</span>
% } elsif ( UNIVERSAL::can($member, 'Name')) {
diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index df52595..c5305ee 100755
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -182,7 +182,7 @@ if ($ARGS{'id'} eq 'new') {
}
}
-$title = loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject);
+$title = loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject || '');
$m->callback(
CallbackName => 'BeforeDisplay',
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index 9664e16..d67c9c2 100755
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -159,7 +159,7 @@
% }
% $m->callback( %ARGS, CallbackName => 'AfterGnuPG' );
-<tr><td class="label"><&|/l&>Subject</&>:</td><td> <input type="text" name="UpdateSubject" value="<% $ARGS{UpdateSubject} || $TicketObj->Subject()%>" />
+<tr><td class="label"><&|/l&>Subject</&>:</td><td> <input type="text" name="UpdateSubject" value="<% $ARGS{UpdateSubject} || $TicketObj->Subject || '' %>" />
% $m->callback( %ARGS, CallbackName => 'AfterSubject' );
</td></tr>
@@ -214,7 +214,7 @@ unless($DefaultStatus){
$DefaultStatus=($ARGS{'Status'} ||$TicketObj->Status());
}
-my $title = loc("Update ticket #[_1] ([_2])", $TicketObj->id, $TicketObj->Subject);
+my $title = loc("Update ticket #[_1] ([_2])", $TicketObj->id, $TicketObj->Subject||'');
# Things needed in the template - we'll do the processing here, just
# for the convenience:
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list