[Rt-commit] r10646 - in rt/branches/3.999-DANGEROUS: lib/RT lib/RT/Interface t/api
jesse at bestpractical.com
jesse at bestpractical.com
Thu Jan 31 21:54:43 EST 2008
Author: jesse
Date: Thu Jan 31 21:54:43 2008
New Revision: 10646
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
rt/branches/3.999-DANGEROUS/t/api/cf_pattern.t
Log:
r76052 at pinglin: jesse | 2008-01-31 21:53:52 -0500
* Fixed cf_pattern.t
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm Thu Jan 31 21:54:43 2008
@@ -1024,17 +1024,17 @@
# We don't care about the magic, if there's really a values element;
next
- if defined $args{'ARGS'}->{'Value'}
- && length $args{'ARGS'}->{'Value'};
+ if defined $args{'ARGS'}->{'value'}
+ && length $args{'ARGS'}->{'value'};
next
- if defined $args{'ARGS'}->{'Values'}
- && length $args{'ARGS'}->{'Values'};
+ if defined $args{'ARGS'}->{'values'}
+ && length $args{'ARGS'}->{'values'};
# "Empty" values does not mean anything for Image and Binary fields
next if $cf_type =~ /^(?:Image|Binary)$/;
- $arg = 'Values';
- $args{'ARGS'}->{'Values'} = undef;
+ $arg = 'values';
+ $args{'ARGS'}->{'values'} = undef;
}
my @values = ();
@@ -1054,11 +1054,11 @@
}
grep defined, @values;
- if ( $arg eq 'AddValue' || $arg eq 'Value' ) {
+ if ( $arg eq 'AddValue' || $arg eq 'value' ) {
foreach my $value (@values) {
my ( $val, $msg ) = $args{'object'}->add_custom_field_value(
- Field => $cf->id,
- Value => $value
+ field => $cf->id,
+ value => $value
);
push( @results, $msg );
}
@@ -1066,27 +1066,27 @@
my $value_hash = _uploaded_file( $args{'Prefix'} . $arg ) or next;
my ( $val, $msg )
= $args{'object'}
- ->add_custom_field_value( %$value_hash, Field => $cf, );
+ ->add_custom_field_value( %$value_hash, field => $cf, );
push( @results, $msg );
- } elsif ( $arg eq 'DeleteValues' ) {
+ } elsif ( $arg eq 'delete_values' ) {
foreach my $value (@values) {
my ( $val, $msg )
= $args{'object'}->delete_custom_field_value(
- Field => $cf,
- Value => $value,
+ field => $cf,
+ value => $value,
);
push( @results, $msg );
}
- } elsif ( $arg eq 'DeleteValueIds' ) {
+ } elsif ( $arg eq 'delete_value_ids' ) {
foreach my $value (@values) {
my ( $val, $msg )
= $args{'object'}->delete_custom_field_value(
- Field => $cf,
- ValueId => $value,
+ field => $cf,
+ value_id => $value,
);
push( @results, $msg );
}
- } elsif ( $arg eq 'Values' && !$cf->repeated ) {
+ } elsif ( $arg eq 'values' && !$cf->repeated ) {
my $cf_values = $args{'object'}->custom_field_values( $cf->id );
my %values_hash;
@@ -1097,8 +1097,8 @@
}
my ( $val, $msg ) = $args{'object'}->add_custom_field_value(
- Field => $cf,
- Value => $value
+ field => $cf,
+ value => $value
);
push( @results, $msg );
$values_hash{$val} = 1 if $val;
@@ -1110,12 +1110,12 @@
my ( $val, $msg )
= $args{'object'}->delete_custom_field_value(
- Field => $cf,
- ValueId => $cf_value->id
+ field => $cf,
+ value_id => $cf_value->id
);
push( @results, $msg );
}
- } elsif ( $arg eq 'Values' ) {
+ } elsif ( $arg eq 'values' ) {
my $cf_values = $args{'object'}->custom_field_values( $cf->id );
# keep everything up to the point of difference, delete the rest
@@ -1136,8 +1136,8 @@
# now add/replace extra things, if any
foreach my $value (@values) {
my ( $val, $msg ) = $args{'object'}->add_custom_field_value(
- Field => $cf,
- Value => $value
+ field => $cf,
+ value => $value
);
push( @results, $msg );
}
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 Thu Jan 31 21:54:43 2008
@@ -93,11 +93,11 @@
my %args = (@_);
unless ( defined $args{'value'} ) {
- $args{'value'} ||= delete $args{'Value'};
+ $args{'value'} ||= delete $args{'value'};
}
unless ( defined $args{'column'} ) {
- $args{'column'} ||= delete $args{'Field'};
+ $args{'column'} ||= delete $args{'field'};
}
$self->SUPER::__set(%args);
@@ -244,7 +244,7 @@
=head2 Create PARAMHASH
-Takes a PARAMHASH of Column -> Value pairs.
+Takes a PARAMHASH of Column -> value pairs.
If any Column has a Validate$PARAMname subroutine defined and the
value provided doesn't pass validation, this routine returns
an error.
@@ -1393,16 +1393,16 @@
sub _add_custom_field_value {
my $self = shift;
my %args = (
- Field => undef,
- Value => undef,
+ field => undef,
+ value => undef,
large_content => undef,
content_type => undef,
record_transaction => 1,
@_
);
- if ( !defined $args{'Field'} ) {
- $args{'Field'} ||= $args{'column'};
- unless ( $args{'Field'} ) {
+ if ( !defined $args{'field'} ) {
+ $args{'field'} ||= delete $args{'column'};
+ unless ( $args{'field'} ) {
Carp::cluck(
"Field argument missing. maybe a mistaken s// changed Field to Column?"
);
@@ -1410,16 +1410,9 @@
}
}
- if ( !defined $args{'Value'} ) {
- $args{'Value'} ||= delete $args{'value'};
- unless ( $args{'Value'} ) {
- Carp::cluck(
- "Value argument missing. maybe i'ts written as 'value'?");
- }
- }
- my $cf = $self->load_custom_field_by_identifier( $args{'Field'} );
+ my $cf = $self->load_custom_field_by_identifier( $args{'field'} );
unless ( $cf->id ) {
- return ( 0, _( "Custom field %1 not found", $args{'Field'} ) );
+ return ( 0, _( "Custom field %1 not found", $args{'field'} ) );
}
my $OCFs = $self->custom_fields;
@@ -1428,18 +1421,18 @@
return (
0,
_( "Custom field %1 does not apply to this object",
- $args{'Field'}
+ $args{'field'}
)
);
}
# empty string is not correct value of any CF, so undef it
- foreach (qw(Value large_content)) {
+ foreach (qw(value large_content)) {
$args{$_} = undef if defined $args{$_} && !length $args{$_};
}
- if ( $cf->can('validate_Value') ) {
- unless ( $cf->validate_value( $args{'Value'} ) ) {
+ if ( $cf->can('validate_value') ) {
+ unless ( $cf->validate_value( $args{'value'} ) ) {
return ( 0, _("Invalid value for custom field") );
}
}
@@ -1489,10 +1482,10 @@
if defined $old_content && !length $old_content;
my $is_the_same = 1;
- if ( defined $args{'Value'} ) {
+ if ( defined $args{'value'} ) {
$is_the_same = 0
unless defined $old_content
- && lc $old_content eq lc $args{'Value'};
+ && lc $old_content eq lc $args{'value'};
} else {
$is_the_same = 0 if defined $old_content;
}
@@ -1512,7 +1505,7 @@
my ( $new_value_id, $value_msg ) = $cf->add_value_for_object(
object => $self,
- Content => $args{'Value'},
+ Content => $args{'value'},
large_content => $args{'large_content'},
content_type => $args{'content_type'},
);
@@ -1563,7 +1556,7 @@
else {
my ( $new_value_id, $msg ) = $cf->add_value_for_object(
object => $self,
- Content => $args{'Value'},
+ Content => $args{'value'},
large_content => $args{'large_content'},
content_type => $args{'content_type'},
);
@@ -1584,7 +1577,7 @@
}
}
return ( $new_value_id,
- _( "%1 added as a value for %2", $args{'Value'}, $cf->name ) );
+ _( "%1 added as a value for %2", $args{'value'}, $cf->name ) );
}
}
@@ -1606,21 +1599,21 @@
sub delete_custom_field_value {
my $self = shift;
my %args = (
- Field => undef,
- Value => undef,
- ValueId => undef,
+ field => undef,
+ value => undef,
+ value_id => undef,
@_
);
- my $cf = $self->load_custom_field_by_identifier( $args{'Field'} );
+ my $cf = $self->load_custom_field_by_identifier( $args{'field'} );
unless ( $cf->id ) {
- return ( 0, _( "Custom field %1 not found", $args{'Field'} ) );
+ return ( 0, _( "Custom field %1 not found", $args{'field'} ) );
}
my ( $val, $msg ) = $cf->delete_value_for_object(
object => $self,
- id => $args{'ValueId'},
- Content => $args{'Value'},
+ id => $args{'value_id'},
+ Content => $args{'value'},
);
unless ($val) {
return ( 0, $msg );
Modified: rt/branches/3.999-DANGEROUS/t/api/cf_pattern.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/cf_pattern.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/cf_pattern.t Thu Jan 31 21:54:43 2008
@@ -19,7 +19,7 @@
works($q->create(name => "CF-Pattern-".$$));
my $cf = new('RT::Model::CustomField');
-my @cf_args = (name => $q->name, type => 'Freeform', queue => $q->id, MaxValues => 1);
+my @cf_args = (name => $q->name, type => 'Freeform', queue => $q->id, max_values => 1);
fails($cf->create(@cf_args, pattern => ')))bad!regex((('));
works($cf->create(@cf_args, pattern => 'good regex'));
@@ -30,8 +30,8 @@
# OK, I'm thoroughly brain washed by HOP at this point now...
sub cnt { $t->custom_field_values($cf->id)->count };
-sub add { $t->add_custom_field_value(Field => $cf->id, Value => $_[0]) };
-sub del { $t->delete_custom_field_value(Field => $cf->id, Value => $_[0]) };
+sub add { $t->add_custom_field_value(field => $cf->id, value => $_[0]) };
+sub del { $t->delete_custom_field_value(field => $cf->id, value => $_[0]) };
is(cnt(), 0, "No values yet");
fails(add('not going to match'));
@@ -41,7 +41,7 @@
fails(del('here is a good regex'));
is(cnt(), 1, "Single CF - Value _not_ deleted");
-$cf->set_max_values(0); # unlimited MaxValues
+$cf->set_max_values(0); # unlimited max_values
works(del('here is a good regex'));
is(cnt(), 0, "Multiple CF - Value deleted");
More information about the Rt-commit
mailing list