[Rt-commit] r8979 - in rt/branches/3.999-DANGEROUS: html/Elements
lib/RT lib/RT/Action lib/RT/Model
lib/RT/Model/CustomFieldValues lib/RT/Shredder
lib/t/data/shredder sbin t/api
jesse at bestpractical.com
jesse at bestpractical.com
Sun Sep 9 02:26:20 EDT 2007
Author: jesse
Date: Sun Sep 9 02:26:20 2007
New Revision: 8979
Added:
rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomFieldValueCollection/
- copied from r8977, /rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomFieldValues/
rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection_Overlay_SQL.pm
- copied unchanged from r8978, /rt/branches/3.999-DANGEROUS/lib/RT/Model/Tickets_Overlay_SQL.pm
Removed:
rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomFieldValues/
rt/branches/3.999-DANGEROUS/lib/RT/Model/Tickets_Overlay_SQL.pm
Modified:
rt/branches/3.999-DANGEROUS/html/Elements/CollectionList
rt/branches/3.999-DANGEROUS/lib/RT/Action/CreateTickets.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/AttributeCollection.pm
rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
rt/branches/3.999-DANGEROUS/lib/RT/SearchBuilder.pm
rt/branches/3.999-DANGEROUS/lib/RT/Shredder/User.pm
rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0001.sql
rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0002.sql
rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0003.sql
rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.clean.db
rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.db
rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in
rt/branches/3.999-DANGEROUS/t/api/attribute-tests.t
Log:
* Finished renaming plural classes to collections
Modified: rt/branches/3.999-DANGEROUS/html/Elements/CollectionList
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/CollectionList (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/CollectionList Sun Sep 9 02:26:20 2007
@@ -140,7 +140,7 @@
}
my $Class = ref $Collection;
-$Class =~ s/s$//;
+$Class =~ s/Collection$//;
$Class =~ s/:/_/g;
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Action/CreateTickets.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Action/CreateTickets.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Action/CreateTickets.pm Sun Sep 9 02:26:20 2007
@@ -1238,9 +1238,9 @@
}
eval "require RT::Action::CreateTickets_Vendor";
-die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action/CreateTicketCollection_Vendor.pm} );
+die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action/CreateTickets_Vendor.pm} );
eval "require RT::Action::CreateTickets_Local";
-die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action/CreateTicketCollection_Local.pm} );
+die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action/CreateTickets_Local.pm} );
1;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/AttributeCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/AttributeCollection.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/AttributeCollection.pm Sun Sep 9 02:26:20 2007
@@ -47,12 +47,12 @@
# END BPS TAGGED BLOCK }}}
=head1 NAME
- RT::Model::Attributecollection - collection of RT::Model::Attribute objects
+ RT::Model::AttributeCollection - collection of RT::Model::Attribute objects
=head1 SYNOPSIS
- use RT::Model::Attributecollection;
-my $Attributes = new RT::Model::Attributecollection($CurrentUser);
+ use RT::Model::AttributeCollection;
+my $Attributes = new RT::Model::AttributeCollection($CurrentUser);
=head1 DESCRIPTION
@@ -64,7 +64,7 @@
use strict;
use warnings;
-package RT::Model::Attributecollection;
+package RT::Model::AttributeCollection;
use base qw'RT::SearchBuilder';
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Record.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Record.pm Sun Sep 9 02:26:20 2007
@@ -67,7 +67,7 @@
use RT::Date;
use RT::Model::User;
-use RT::Model::Attributecollection;
+use RT::Model::AttributeCollection;
use RT::Model::Attribute;
use Encode qw();
@@ -166,7 +166,7 @@
=head2 Attributes
-Return this object's attributes as an RT::Model::Attributecollection object
+Return this object's attributes as an RT::Model::AttributeCollection object
=cut
@@ -174,7 +174,7 @@
my $self = shift;
unless ($self->{'attributes'}) {
- $self->{'attributes'} = RT::Model::Attributecollection->new($self->CurrentUser);
+ $self->{'attributes'} = RT::Model::AttributeCollection->new($self->CurrentUser);
$self->{'attributes'}->LimitToObject($self);
}
return ($self->{'attributes'});
Modified: rt/branches/3.999-DANGEROUS/lib/RT/SearchBuilder.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/SearchBuilder.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/SearchBuilder.pm Sun Sep 9 02:26:20 2007
@@ -235,7 +235,7 @@
sub _SingularClass {
my $self = shift;
my $class = ref($self);
- $class =~ s/s$// or die "Cannot deduce SingularClass for $class";
+ $class =~ s/Collection$// or die "Cannot deduce SingularClass for $class";
return $class;
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/User.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/User.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/User.pm Sun Sep 9 02:26:20 2007
@@ -57,23 +57,23 @@
use RT::Shredder::Dependencies;
my @OBJECTS = qw(
- Attachments
- CachedGroupMembers
- CustomFields
- CustomFieldValues
- GroupMembers
- Groups
- Links
- Principals
- Queues
- ScripActions
- ScripConditions
- Scrips
- Templates
- ObjectCustomFieldValues
- Tickets
- Transactions
- Users
+ AttachmentCollection
+ CachedGroupMemberCollection
+ CustomFieldCollection
+ CustomFieldValueCollection
+ GroupMemberCollection
+ GroupCollection
+ LinkCollection
+ PrincipalCollection
+ QueueCollection
+ ScripActionCollection
+ ScripConditionCollection
+ ScripCollection
+ TemplateCollection
+ ObjectCustomFieldValueCollection
+ TicketCollection
+ TransactionCollection
+ UserCollection
);
sub __DependsOn
Modified: rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0001.sql
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0001.sql (original)
+++ rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0001.sql Sun Sep 9 02:26:20 2007
@@ -20,7 +20,7 @@
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','2','RT::Model::Ticket','Create','31');
INSERT INTO "Links"("Base","Creator","LocalBase","LocalTarget","Target","Type","id") valueS('fsck.com-rt://example.com/ticket/2','1','2','1','fsck.com-rt://example.com/ticket/1','MemberOf','1');
INSERT INTO "Transactions"("Creator","Field","NewValue","ObjectId","ObjectType","Type","id") valueS('1','has_member','fsck.com-rt://example.com/ticket/2','1','RT::Model::Ticket','AddLink','30');
-INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','2','2007-09-06 02:21:19','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','child','ticket','2');
+INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','2','2007-09-09 06:20:39','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','child','ticket','2');
INSERT INTO "CachedGroupMembers"("GroupId","ImmediateParentId","MemberId","Via","id") valueS('25','25','25','33','33');
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','25','RT::Model::Group','Create','24');
INSERT INTO "Groups"("Domain","Instance","Type","id") valueS('RT::Model::Ticket-Role','1','AdminCc','25');
@@ -41,4 +41,4 @@
INSERT INTO "Groups"("Domain","Instance","Type","id") valueS('RT::Model::Ticket-Role','1','Requestor','22');
INSERT INTO "Principals"("ObjectId","PrincipalType","id") valueS('22','Group','22');
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','1','RT::Model::Ticket','Create','25');
-INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','1','2007-09-06 02:21:19','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','parent','ticket','1');
+INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','1','2007-09-09 06:20:39','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','parent','ticket','1');
Modified: rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0002.sql
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0002.sql (original)
+++ rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0002.sql Sun Sep 9 02:26:20 2007
@@ -23,7 +23,7 @@
INSERT INTO "Transactions"("Creator","Field","NewValue","ObjectId","ObjectType","Type","id") valueS('1','has_member','fsck.com-rt://example.com/ticket/2','1','RT::Model::Ticket','AddLink','30');
INSERT INTO "Links"("Base","Creator","LocalBase","LocalTarget","Target","Type","id") valueS('fsck.com-rt://example.com/ticket/2','1','2','1','fsck.com-rt://example.com/ticket/1','DependsOn','2');
INSERT INTO "Transactions"("Creator","Field","NewValue","ObjectId","ObjectType","Type","id") valueS('1','DependedOnBy','fsck.com-rt://example.com/ticket/2','1','RT::Model::Ticket','AddLink','33');
-INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','2','2007-09-06 02:21:20','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','child','ticket','2');
+INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','2','2007-09-09 06:20:40','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','child','ticket','2');
INSERT INTO "CachedGroupMembers"("GroupId","ImmediateParentId","MemberId","Via","id") valueS('25','25','25','33','33');
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','25','RT::Model::Group','Create','24');
INSERT INTO "Groups"("Domain","Instance","Type","id") valueS('RT::Model::Ticket-Role','1','AdminCc','25');
@@ -44,4 +44,4 @@
INSERT INTO "Groups"("Domain","Instance","Type","id") valueS('RT::Model::Ticket-Role','1','Requestor','22');
INSERT INTO "Principals"("ObjectId","PrincipalType","id") valueS('22','Group','22');
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','1','RT::Model::Ticket','Create','25');
-INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','1','2007-09-06 02:21:20','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','parent','ticket','1');
+INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','1','2007-09-09 06:20:40','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','parent','ticket','1');
Modified: rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0003.sql
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0003.sql (original)
+++ rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.0003.sql Sun Sep 9 02:26:20 2007
@@ -20,7 +20,7 @@
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','3','RT::Model::Ticket','Create','37');
INSERT INTO "Links"("Base","Creator","LocalBase","LocalTarget","Target","Type","id") valueS('fsck.com-rt://example.com/ticket/3','1','3','1','fsck.com-rt://example.com/ticket/1','MemberOf','2');
INSERT INTO "Transactions"("Creator","Field","NewValue","ObjectId","ObjectType","Type","id") valueS('1','has_member','fsck.com-rt://example.com/ticket/3','1','RT::Model::Ticket','AddLink','36');
-INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','3','2007-09-06 02:21:22','1','10','1','2007-09-06 02:21:22','2007-09-06 02:21:22','1970-01-01 00:00:00','resolved','child','ticket','3');
+INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','3','2007-09-09 06:20:42','1','10','1','2007-09-09 06:20:42','2007-09-09 06:20:42','1970-01-01 00:00:00','resolved','child','ticket','3');
INSERT INTO "CachedGroupMembers"("GroupId","ImmediateParentId","MemberId","Via","id") valueS('25','25','25','33','33');
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','25','RT::Model::Group','Create','24');
INSERT INTO "Groups"("Domain","Instance","Type","id") valueS('RT::Model::Ticket-Role','1','AdminCc','25');
@@ -43,7 +43,7 @@
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','1','RT::Model::Ticket','Create','25');
INSERT INTO "Transactions"("Creator","Field","NewValue","ObjectId","ObjectType","Type","id") valueS('1','has_member','fsck.com-rt://example.com/ticket/2','1','RT::Model::Ticket','AddLink','30');
INSERT INTO "Links"("Base","Creator","LocalBase","LocalTarget","Target","Type","id") valueS('fsck.com-rt://example.com/ticket/2','1','2','1','fsck.com-rt://example.com/ticket/1','MemberOf','1');
-INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','1','2007-09-06 02:21:22','1','10','1','2007-09-06 02:21:21','2007-09-06 02:21:21','1970-01-01 00:00:00','resolved','parent','ticket','1');
+INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','1','2007-09-09 06:20:42','1','10','1','2007-09-09 06:20:41','2007-09-09 06:20:41','1970-01-01 00:00:00','resolved','parent','ticket','1');
INSERT INTO "CachedGroupMembers"("GroupId","ImmediateParentId","MemberId","Via","id") valueS('29','29','29','39','39');
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','29','RT::Model::Group','Create','29');
INSERT INTO "Groups"("Domain","Instance","Type","id") valueS('RT::Model::Ticket-Role','2','AdminCc','29');
@@ -64,4 +64,4 @@
INSERT INTO "Groups"("Domain","Instance","Type","id") valueS('RT::Model::Ticket-Role','2','Requestor','26');
INSERT INTO "Principals"("ObjectId","PrincipalType","id") valueS('26','Group','26');
INSERT INTO "Transactions"("Creator","ObjectId","ObjectType","Type","id") valueS('1','2','RT::Model::Ticket','Create','31');
-INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','2','2007-09-06 02:21:22','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','child','ticket','2');
+INSERT INTO "Tickets"("Creator","Due","EffectiveId","LastUpdated","LastUpdatedBy","Owner","Queue","Resolved","Started","Starts","Status","Subject","Type","id") valueS('1','1970-01-01 00:00:00','2','2007-09-09 06:20:42','1','10','1','1970-01-01 00:00:00','1970-01-01 00:00:00','1970-01-01 00:00:00','new','child','ticket','2');
Modified: rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.clean.db
==============================================================================
Binary files. No diff available.
Modified: rt/branches/3.999-DANGEROUS/lib/t/data/shredder/03plugin_tickets.db
==============================================================================
Binary files. No diff available.
Modified: rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in
==============================================================================
--- rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in (original)
+++ rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in Sun Sep 9 02:26:20 2007
@@ -145,7 +145,7 @@
}
}
- if (eval { require RT::Model::Attributecollection; 1 }) {
+ if (eval { require RT::Model::AttributeCollection; 1 }) {
my $attributes = $obj->attributes;
while (my $attribute = $attributes->next) {
my $content = $attribute->Content;
Modified: rt/branches/3.999-DANGEROUS/t/api/attribute-tests.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/attribute-tests.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/attribute-tests.t Sun Sep 9 02:26:20 2007
@@ -10,7 +10,7 @@
my $attribute = "squelch-$runid";
-ok(require RT::Model::Attributecollection);
+ok(require RT::Model::AttributeCollection);
my $user = RT::Model::User->new($RT::SystemUser);
ok (UNIVERSAL::isa($user, 'RT::Model::User'));
@@ -26,7 +26,7 @@
ok(1, $attr->build_select_query);
-ok (UNIVERSAL::isa($attr,'RT::Model::Attributecollection'), 'got the attributes object');
+ok (UNIVERSAL::isa($attr,'RT::Model::AttributeCollection'), 'got the attributes object');
($id, $msg) = $user->add_attribute(Name => 'TestAttr', Content => 'The attribute has content');
ok ($id, $msg);
More information about the Rt-commit
mailing list