[Rt-commit] r10713 - in rt/branches/3.999-DANGEROUS: . etc html/Elements/RT__Model__Ticket html/Search/Elements html/SelfService/Elements t t/web
jesse at bestpractical.com
jesse at bestpractical.com
Mon Feb 4 11:15:07 EST 2008
Author: jesse
Date: Mon Feb 4 11:15:06 2008
New Revision: 10713
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Ticket/ColumnMap
rt/branches/3.999-DANGEROUS/html/Search/Elements/BuildFormatString
rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests
rt/branches/3.999-DANGEROUS/share/po/it.po
rt/branches/3.999-DANGEROUS/t/savedsearch.t
rt/branches/3.999-DANGEROUS/t/test_config.yml
rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t
Log:
r76175 at pinglin: jesse | 2008-02-04 11:14:07 -0500
* now only failing two tests on web/crypt-gnupg.t
Modified: rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/RT_Config.pm (original)
+++ rt/branches/3.999-DANGEROUS/etc/RT_Config.pm Mon Feb 4 11:15:06 2008
@@ -590,7 +590,7 @@
'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__subject__</a></B>/TITLE:subject',
Status,
Queuename,
- Ownername,
+ owner_name,
Priority,
'__NEWLINE__',
'',
Modified: rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Ticket/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Ticket/ColumnMap (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Ticket/ColumnMap Mon Feb 4 11:15:06 2008
@@ -80,7 +80,7 @@
title => 'queue',
value => sub { return $_[0]->queue_obj->name }
},
- Ownername => {
+ owner_name => {
title => 'Owner',
attribute => 'Owner',
value => sub { return $_[0]->owner_obj->name }
@@ -152,7 +152,7 @@
title => 'Time Estimated',
value => sub { return $_[0]->time_estimated }
},
- Requestors => {
+ requestors => {
attribute => 'Requestor.email',
value => sub { return $_[0]->requestors->member_emails_as_string }
},
@@ -225,7 +225,7 @@
$_[0]->_('New'), \'</a>';
},
},
- KeyRequestors => {
+ key_requestors => {
title => 'Requestors',
attribute => 'Requestor.email',
value => sub {
@@ -244,7 +244,7 @@
return join ', ', @requestors;
}
},
- KeyOwnername => {
+ key_owner_name => {
title => 'Owner',
attribute => 'Owner',
value => sub {
@@ -307,14 +307,14 @@
$TICKET_COLUMN_MAP->{'CF'} = $TICKET_COLUMN_MAP->{'CustomField'};
-# if no GPG support, then KeyOwnername and KeyRequestors fall back to the regular
+# if no GPG support, then key_owner_name and key_requestors fall back to the regular
# versions
if (RT->config->get('GnuPG')->{'enable'}) {
require RT::Crypt::GnuPG;
}
else {
- $TICKET_COLUMN_MAP->{KeyOwnername} = $TICKET_COLUMN_MAP->{Ownername};
- $TICKET_COLUMN_MAP->{KeyRequestors} = $TICKET_COLUMN_MAP->{Requestors};
+ $TICKET_COLUMN_MAP->{key_owner_name} = $TICKET_COLUMN_MAP->{owner_name};
+ $TICKET_COLUMN_MAP->{key_requestors} = $TICKET_COLUMN_MAP->{requestors};
}
</%ONCE>
<%init>
Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/BuildFormatString
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/BuildFormatString (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/BuildFormatString Mon Feb 4 11:15:06 2008
@@ -69,7 +69,7 @@
Status ExtendedStatus UpdateStatus
Type
- Ownername Requestors Cc AdminCc CreatedBy LastUpdatedBy
+ owner_name Requestors Cc AdminCc CreatedBy LastUpdatedBy
Priority initial_priority final_priority
Modified: rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests (original)
+++ rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests Mon Feb 4 11:15:06 2008
@@ -72,7 +72,7 @@
'<B><A HREF="}. RT->config->get('WebPath') .qq{/SelfService/Display.html?id=__id__">__subject__</a></B>/TITLE:subject',
Status,
Requestors,
- Ownername};
+ owner_name};
</%INIT>
<%ARGS>
$friendly_status => _('open')
Modified: rt/branches/3.999-DANGEROUS/share/po/it.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/it.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/it.po Mon Feb 4 11:15:06 2008
@@ -4165,7 +4165,7 @@
msgstr "In carico a"
#: NOT FOUND IN SOURCE
-msgid "Ownername"
+msgid "owner_name"
msgstr "NomeIncaricato"
#: html/Elements/TicketList:78
Modified: rt/branches/3.999-DANGEROUS/t/savedsearch.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/savedsearch.t (original)
+++ rt/branches/3.999-DANGEROUS/t/savedsearch.t Mon Feb 4 11:15:06 2008
@@ -53,7 +53,7 @@
\'<b><a href="/Ticket/Display.html?id=__id__">__subject__</a></b>/TITLE:subject\',
\'__Status__\',
\'__Queuename__\',
-\'__Ownername__\',
+\'__owner_name__\',
\'__Priority__\',
\'__NEWLINE__\',
\'\',
Modified: rt/branches/3.999-DANGEROUS/t/test_config.yml
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/test_config.yml (original)
+++ rt/branches/3.999-DANGEROUS/t/test_config.yml Mon Feb 4 11:15:06 2008
@@ -1,4 +1,4 @@
---
framework:
- LogLevel: DEBUG
+ LogLevel: WARN
Modified: rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t Mon Feb 4 11:15:06 2008
@@ -16,10 +16,10 @@
RT->config->set( DefaultSearchResultFormat => qq{
'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__subject__</a></B>/TITLE:subject',
- 'OO-__Ownername__-O',
- 'OR-__Requestors__-O',
- 'KO-__KeyOwnername__-K',
- 'KR-__KeyRequestors__-K',
+ 'OO-__owner_name__-O',
+ 'OR-__requestors__-O',
+ 'KO-__key_owner_name__-K',
+ 'KR-__key_requestors__-K',
Status});
use File::Spec ();
@@ -347,19 +347,19 @@
return $mail;
}
-# now test the OwnernameKey and RequestorsKey fields
+# now test the owner_nameKey and RequestorsKey fields
my $nokey = RT::Test->load_or_create_user(name => 'nokey', email => 'nokey at example.com');
$nokey->principal_object->grant_right(right => 'CreateTicket');
$nokey->principal_object->grant_right(right => 'OwnTicket');
my $tick = RT::Model::Ticket->new(current_user => RT->system_user );
$tick->create(subject => 'owner lacks pubkey', queue => 'general',
- Owner => $nokey);
+ owner => $nokey);
ok(my $id = $tick->id, 'created ticket for owner-without-pubkey');
$tick = RT::Model::Ticket->new(current_user => RT->system_user );
$tick->create(subject => 'owner has pubkey', queue => 'general',
- Owner => 'root');
+ owner => 'root');
ok($id = $tick->id, 'created ticket for owner-with-pubkey');
my $mail = << "MAIL";
Subject: Nokey requestor
@@ -417,18 +417,18 @@
$content =~ s/(/(/g;
$content =~ s/)/)/g;
-like($content, qr/OO-Nobody-O/, "original Ownername untouched");
-like($content, qr/OO-nokey-O/, "original Ownername untouched");
-like($content, qr/OO-root-O/, "original Ownername untouched");
+like($content, qr/OO-Nobody-O/, "original owner_name untouched");
+like($content, qr/OO-nokey-O/, "original owner_name untouched");
+like($content, qr/OO-root-O/, "original owner_name untouched");
like($content, qr/OR-recipient\@example.com-O/, "original Requestors untouched");
like($content, qr/OR-nokey\@example.com-O/, "original Requestors untouched");
-like($content, qr/KO-root-K/, "KeyOwnername does not issue no-pubkey warning for recipient");
-like($content, qr/KO-nokey \(no pubkey!\)-K/, "KeyOwnername issues no-pubkey warning for root");
-like($content, qr/KO-Nobody \(no pubkey!\)-K/, "KeyOwnername issues no-pubkey warning for nobody");
-
-like($content, qr/KR-recipient\@example.com-K/, "KeyRequestors does not issue no-pubkey warning for recipient\@example.com");
-like($content, qr/KR-general\@example.com-K/, "KeyRequestors does not issue no-pubkey warning for general\@example.com");
-like($content, qr/KR-nokey\@example.com \(no pubkey!\)-K/, "KeyRequestors DOES issue no-pubkey warning for nokey\@example.com");
+like($content, qr/KO-root-K/, "key_owner_name does not issue no-pubkey warning for recipient");
+like($content, qr/KO-nokey \(no pubkey!\)-K/, "key_owner_name issues no-pubkey warning for root");
+like($content, qr/KO-Nobody \(no pubkey!\)-K/, "key_owner_name issues no-pubkey warning for nobody");
+
+like($content, qr/KR-recipient\@example.com-K/, "key_requestors does not issue no-pubkey warning for recipient\@example.com");
+like($content, qr/KR-general\@example.com-K/, "key_requestors does not issue no-pubkey warning for general\@example.com");
+like($content, qr/KR-nokey\@example.com \(no pubkey!\)-K/, "key_requestors DOES issue no-pubkey warning for nokey\@example.com");
More information about the Rt-commit
mailing list