[Rt-commit] r10698 - in rt/branches/3.999-DANGEROUS: . html/Admin/CustomFields html/Admin/Elements html/Elements html/Helpers/Autocomplete lib/RT lib/RT/Crypt lib/RT/Interface lib/RT/Model sbin

jesse at bestpractical.com jesse at bestpractical.com
Sun Feb 3 17:58:34 EST 2008


Author: jesse
Date: Sun Feb  3 17:58:32 2008
New Revision: 10698

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/html/Admin/CustomFields/Modify.html
   rt/branches/3.999-DANGEROUS/html/Admin/Elements/AddCustomFieldValue
   rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomFieldValues
   rt/branches/3.999-DANGEROUS/html/Elements/EditCustomField
   rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldAutocomplete
   rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldCombobox
   rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldFreeform
   rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldSelect
   rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldText
   rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldWikitext
   rt/branches/3.999-DANGEROUS/html/Elements/ValidateCustomFields
   rt/branches/3.999-DANGEROUS/html/Helpers/Autocomplete/CustomFieldValues
   rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Config.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
   rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in
   rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t

Log:
 r76149 at pinglin:  jesse | 2008-02-03 17:55:39 -0500
 * passing cf_select_one.t


Modified: rt/branches/3.999-DANGEROUS/html/Admin/CustomFields/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/CustomFields/Modify.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/CustomFields/Modify.html	Sun Feb  3 17:58:32 2008
@@ -173,7 +173,7 @@
     );
     $CustomFieldObj->set_values_class( $valuesClass );
 
-    my $paramtag = "CustomField-". $CustomFieldObj->id ."-Value";
+    my $paramtag = "CustomField-". $CustomFieldObj->id ."-value";
     # Delete any fields that want to be deleted
     foreach my $key ( keys %ARGS ) {
         next unless $key =~ /^Delete-$paramtag-(\d+)$/o;

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/AddCustomFieldValue
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/AddCustomFieldValue	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/AddCustomFieldValue	Sun Feb  3 17:58:32 2008
@@ -58,7 +58,7 @@
 % }
 </tr>
 
-% my $paramtag = "CustomField-". $CustomField->id ."-Value-new";
+% my $paramtag = "CustomField-". $CustomField->id ."-value-new";
 <tr>
 <td><input type="text" size="3"  name="<% $paramtag %>-sort_order"   /></td>
 <td><input type="text" size="30" name="<% $paramtag %>-name"        /></td>

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomFieldValues
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomFieldValues	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomFieldValues	Sun Feb  3 17:58:32 2008
@@ -64,7 +64,7 @@
 </tr>
 
 % while ( my $value = $values->next ) {
-% my $paramtag = "CustomField-". $CustomField->id ."-Value-". $value->id;
+% my $paramtag = "CustomField-". $CustomField->id ."-value-". $value->id;
 <tr>
 <td><input type="checkbox" class="checkbox" name="Delete-<% $paramtag %>" /></td>
 <td><input type="text" size="3" name="<% $paramtag %>-sort_order" value="<% $value->sort_order %>" /></td>

Modified: rt/branches/3.999-DANGEROUS/html/Elements/EditCustomField
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/EditCustomField	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/EditCustomField	Sun Feb  3 17:58:32 2008
@@ -61,8 +61,8 @@
     $namePrefix ||= join('-', 'object', ref($object), $object->id, 'CustomField', '');
 } elsif (not $Default) {
     my %TOP = $m->request_args;
-    $Default = $TOP{ $namePrefix .$CustomField->id . '-Values' }
-            || $TOP{ $namePrefix .$CustomField->id . '-Value' };
+    $Default = $TOP{ $namePrefix .$CustomField->id . '-values' }
+            || $TOP{ $namePrefix .$CustomField->id . '-value' };
 }
 
 my $MaxValues = $CustomField->max_values;
@@ -72,9 +72,9 @@
     $Default = ($values->first ? $values->first->content : '') unless $Default;
     $values->goto_first_item;
 }
-# The "Magic" hidden input causes RT to know that we were trying to edit the field, even if 
+# The "magic" hidden input causes RT to know that we were trying to edit the field, even if 
 # we don't see a value later, since browsers aren't compelled to submit empty form fields
-$m->out("\n".'<input type="hidden" class="hidden" name="'.$namePrefix.$CustomField->id.'-Values-Magic" value="1" />'."\n");
+$m->out("\n".'<input type="hidden" class="hidden" name="'.$namePrefix.$CustomField->id.'-values-magic" value="1" />'."\n");
 
 my $EditComponent = "EditCustomField$Type";
 $m->callback( Callbackname => 'EditComponentname', name => \$EditComponent, CustomField => $CustomField, object => $object );

Modified: rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldAutocomplete
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldAutocomplete	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldAutocomplete	Sun Feb  3 17:58:32 2008
@@ -49,19 +49,19 @@
 <script type="text/javascript" src="<%RT->config->get('WebPath')%>/NoAuth/js/libs/scriptaculous/effects.js"></script>
 <script type="text/javascript" src="<%RT->config->get('WebPath')%>/NoAuth/js/libs/scriptaculous/controls.js"></script>
 % if ( $Multiple ) {
-<textarea cols="<% $Cols %>" rows="<% $Rows %>" name="<% $name %>-Values" id="<% $name %>-Values" ><% $Default %></textarea><div id="<% $name %>-Choices" class="autocomplete"></div>
+<textarea cols="<% $Cols %>" rows="<% $Rows %>" name="<% $name %>-values" id="<% $name %>-values" ><% $Default %></textarea><div id="<% $name %>-Choices" class="autocomplete"></div>
 <script type="text/javascript">
 new Ajax.Autocompleter(
-    "<% $name %>-Values",
+    "<% $name %>-values",
     "<% $name %>-Choices",
     "/Helpers/Autocomplete/custom_field_values",
     { tokens: [ '\n' ] }
 );
 % } else {
-<input type="text" id="<% $name %>-Value" name="<% $name %>-Value" value="<% $Default %>"/><div id="<% $name %>-Choices" class="autocomplete"></div>
+<input type="text" id="<% $name %>-value" name="<% $name %>-value" value="<% $Default %>"/><div id="<% $name %>-Choices" class="autocomplete"></div>
 <script type="text/javascript">
 new Ajax.Autocompleter(
-    "<% $name %>-Value",
+    "<% $name %>-value",
     "<% $name %>-Choices",
     "/Helpers/Autocomplete/custom_field_values",
     {}

Modified: rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldCombobox
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldCombobox	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldCombobox	Sun Feb  3 17:58:32 2008
@@ -51,7 +51,7 @@
 % }
 % (!$Multiple or !$MaxValues or !$values or $values->count < $MaxValues) or return;
 <& /Widgets/ComboBox,
-    name    => $namePrefix . $CustomField->id . "-Value",
+    name    => $namePrefix . $CustomField->id . "-value",
     Default => $Default,
     Rows    => $Rows,
     Values  => [map {$_->name} @{$CustomField->values->items_array_ref}],

Modified: rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldFreeform
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldFreeform	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldFreeform	Sun Feb  3 17:58:32 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-% my $name = $namePrefix . $CustomField->id . '-Value';
+% my $name = $namePrefix . $CustomField->id . '-value';
 % if ($Multiple) {
 <textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$name%>s" id="<%$name%>s" wrap="off"><% $Default || '' %></textarea>
 % } else {

Modified: rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldSelect
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldSelect	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldSelect	Sun Feb  3 17:58:32 2008
@@ -55,7 +55,7 @@
 %       if (@category) {
 <script type="text/javascript" src="<%RT->config->get('WebPath')%>/NoAuth/js/cascaded.js"></script>
 %#      XXX - Hide this select from w3m?
-      <select onchange="filter_cascade('<% $id %>-Values', this.value)" name="<% $id %>-category">
+      <select onchange="filter_cascade('<% $id %>-values', this.value)" name="<% $id %>-category">
         <option value="" <% !$selected && 'selected' %>><&|/l&>-</&></option>
 %           foreach my $cat (@category) {
 %               my ($depth, $name) = @$cat;
@@ -63,7 +63,7 @@
 %           }
       </select><br />
 %       }
-      <select name="<%$id%>-Values" id="<%$id%>-Values"
+      <select name="<%$id%>-values" id="<%$id%>-values"
 %       if ( $Rows && ( $Multiple || !@category ) ) {
         size="<% $Rows %>"
 %       }

Modified: rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldText
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldText	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldText	Sun Feb  3 17:58:32 2008
@@ -46,10 +46,10 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 % while ($values and my $value = $values->next ) {
-<textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$namePrefix%><%$CustomField->id%>-Values"><% $value->content %></textarea><br />
+<textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$namePrefix%><%$CustomField->id%>-values"><% $value->content %></textarea><br />
 % }
 % if (!$MaxValues or !$values or $values->count < $MaxValues) {
-<textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$namePrefix%><%$CustomField->id%>-Values"><% $Default %></textarea>
+<textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$namePrefix%><%$CustomField->id%>-values"><% $Default %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.

Modified: rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldWikitext
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldWikitext	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/EditCustomFieldWikitext	Sun Feb  3 17:58:32 2008
@@ -46,10 +46,10 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 % while ($values and my $value = $values->next ) {
-<textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$namePrefix%><%$CustomField->id%>-Values"><% $value->content %></textarea><br />
+<textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$namePrefix%><%$CustomField->id%>-values"><% $value->content %></textarea><br />
 % }
 % if (!$MaxValues or !$values or $values->count < $MaxValues) {
-<textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$namePrefix%><%$CustomField->id%>-Values"><% $Default %></textarea>
+<textarea cols="<%$Cols%>" rows="<%$Rows%>" name="<%$namePrefix%><%$CustomField->id%>-values"><% $Default %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.

Modified: rt/branches/3.999-DANGEROUS/html/Elements/ValidateCustomFields
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/ValidateCustomFields	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/ValidateCustomFields	Sun Feb  3 17:58:32 2008
@@ -49,10 +49,10 @@
 my ($valid, @res) = (1, ());
 $CustomFields->goto_first_item;
 while ( my $CF = $CustomFields->next ) {
-    my $field = $namePrefix . $CF->id . "-Value";
+    my $field = $namePrefix . $CF->id . "-value";
 
     my $value;
-    if ($args_ref->{"${field}s-Magic"} and exists $args_ref->{"${field}s"}) {
+    if ($args_ref->{"${field}s-magic"} and exists $args_ref->{"${field}s"}) {
         $value = $args_ref->{"${field}s"};
 
         # We only validate Single Combos -- multis can never be user input

Modified: rt/branches/3.999-DANGEROUS/html/Helpers/Autocomplete/CustomFieldValues
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Helpers/Autocomplete/CustomFieldValues	(original)
+++ rt/branches/3.999-DANGEROUS/html/Helpers/Autocomplete/CustomFieldValues	Sun Feb  3 17:58:32 2008
@@ -56,7 +56,7 @@
 <%INIT>
 my ($CustomField, $value);
 while( my($k, $v) = each %ARGS ) {
-    next unless $k =~ /^object-.*?-\d*-CustomField-(\d+)-Values$/;
+    next unless $k =~ /^object-.*?-\d*-CustomField-(\d+)-values$/;
     ($CustomField, $value) = ($1, $v);
     last;
 }

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm	Sun Feb  3 17:58:32 2008
@@ -198,7 +198,7 @@
         for my $item (@CustomFields) {
             my $new_entry = RT::Model::CustomField->new(
                 current_user => RT->system_user );
-            my $values = delete $item->{'Values'};
+            my $values = delete $item->{'values'};
 
             my @queues;
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Config.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Config.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Config.pm	Sun Feb  3 17:58:32 2008
@@ -104,7 +104,7 @@
         WidgetArguments => {
             description => 'Interface style',        #loc
                  # XXX: we need support for 'get values callback'
-            Values => [qw(3.5-default 3.4-compat)],
+            values => [qw(3.5-default 3.4-compat)],
         },
     },
     DefaultSummaryRows => {
@@ -157,7 +157,7 @@
         Widget          => '/Widgets/Form/Select',
         WidgetArguments => {
             description  => 'Date and time output format',            #loc
-            Values       => [qw(default_format RFC2822 ISO W3CDTF)],
+            values       => [qw(default_format RFC2822 ISO W3CDTF)],
             values_label => {
                 default_format => 'Default (Tue Dec 25 21:59:12 1995)',    #loc
                 RFC2822       => 'RFC (Tue, 25 Dec 1995 21:59:12 -0300)', #loc
@@ -262,7 +262,7 @@
             my ( $pack, $file, $line ) = caller;
             return $self->set_from_config(
                 Option     => $opt_ref,
-                Value      => [@args],
+                value      => [@args],
                 Package    => $pack,
                 File       => $file,
                 Line       => $line,
@@ -458,7 +458,7 @@
     foreach (qw(Package File Line SiteConfig Extension)) {
         $META{$name}->{'Source'}->{$_} = $args{$_};
     }
-    $self->set( $name, @{ $args{'Value'} } );
+    $self->set( $name, @{ $args{'value'} } );
 
     return 1;
 }
@@ -553,17 +553,5 @@
     return @res;
 }
 
-=head3 Type
-
-=cut
-
-sub type {
-    my $self = shift;
-    my $name = shift;
-}
-
-=head3 IsOverridable
-
-=cut
 
 1;

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm	Sun Feb  3 17:58:32 2008
@@ -231,7 +231,7 @@
 
 See also `perldoc lib/RT/Interface/Email/Auth/GnuPG.pm`.
 
-=head2 Errors handling
+=head2 Error handling
 
 There are several global templates created in the database by default. RT
 uses these templates to send error messages to users or RT's owner. These 
@@ -477,7 +477,7 @@
 
     my %res;
     if ( $args{'sign'} && !$args{'encrypt'} ) {
-
+    warn "Signing, not encrypting";
         # required by RFC3156(Ch. 5) and RFC1847(Ch. 2.1)
         $entity->head->mime_attr(
             'Content-Transfer-Encoding' => 'quoted-printable' );
@@ -502,6 +502,7 @@
             waitpid $pid, 0;
         };
         my $err       = $@;
+        warn "Error was $err";
         my @signature = readline $handle{'output'};
         close $handle{'output'};
 
@@ -512,13 +513,10 @@
             close $handle{$_};
         }
         Jifty->log->debug( $res{'status'} ) if $res{'status'};
-        Jifty->log->warn( $res{'error'} )   if $res{'error'};
+        Jifty->log->warn( "EEEEE". $res{'error'} )   if $res{'error'};
         Jifty->log->error( $res{'logger'} ) if $res{'logger'} && $?;
         if ( $err || $res{'exit_code'} ) {
-            $res{'message'}
-                = $err
-                ? $err
-                : "gpg exitted with error code " . ( $res{'exit_code'} >> 8 );
+            $res{'message'} = $err ? $err : "gpg exitted with error code " . ( $res{'exit_code'} >> 8 );
             return %res;
         }
 
@@ -576,7 +574,7 @@
             close $handle{$_};
         }
         Jifty->log->debug( $res{'status'} ) if $res{'status'};
-        Jifty->log->warn( $res{'error'} )   if $res{'error'};
+        Jifty->log->warn( "EE". $res{'error'} )   if $res{'error'};
         Jifty->log->error( $res{'logger'} ) if $res{'logger'} && $?;
         if ( $@ || $? ) {
             $res{'message'}
@@ -601,8 +599,7 @@
             Filename    => '',
             Encoding    => '7bit',
         );
-        $entity->parts(-1)->bodyhandle->{'_dirty_hack_to_save_a_ref_tmp_fh'}
-            = $tmp_fh;
+        $entity->parts(-1)->bodyhandle->{'_dirty_hack_to_save_a_ref_tmp_fh'} = $tmp_fh;
     }
     return %res;
 }

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	Sun Feb  3 17:58:32 2008
@@ -355,13 +355,13 @@
     }
 
     foreach my $arg ( keys %ARGS ) {
-        next if $arg =~ /-(?:Magic|category)$/;
+        next if $arg =~ /-(?:magic|category)$/;
 
         if ( $arg =~ /^object-RT::Model::Transaction--CustomField-/ ) {
             $create_args{$arg} = $ARGS{$arg};
         }
 
-        # object-RT::Model::Ticket--CustomField-3-Values
+        # object-RT::Model::Ticket--CustomField-3-values
         elsif ( $arg =~ /^object-RT::Model::Ticket--CustomField-(\d+)(.*?)$/ )
         {
             my $cfid = $1;
@@ -713,7 +713,7 @@
     my $date_obj = RT::Date->new();
     $date_obj->set(
         format => 'unknown',
-        Value  => $date
+        value  => $date
     );
     return ( $date_obj->iso );
 }
@@ -1020,7 +1020,7 @@
 
         # since http won't pass in a form element with a null value, we need
         # to fake it
-        if ( $arg eq 'Values-Magic' ) {
+        if ( $arg eq 'values-magic' ) {
 
           # We don't care about the magic, if there's really a values element;
             next
@@ -1277,7 +1277,7 @@
         my $DateObj = RT::Date->new();
         $DateObj->set(
             format => 'unknown',
-            Value  => $args_ref->{ $field . '_Date' }
+            value  => $args_ref->{ $field . '_Date' }
         );
 
         my $obj = $field . "_obj";
@@ -1477,9 +1477,4 @@
     return ( _load_container_object( $obj_type, $obj_id ), $search_id );
 }
 
-eval "require RT::Interface::Web_Vendor";
-die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Interface/Web_Vendor.pm} );
-eval "require RT::Interface::Web_Local";
-die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Interface/Web_Local.pm} );
-
 1;

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm	Sun Feb  3 17:58:32 2008
@@ -1205,7 +1205,7 @@
         next
             unless ( $arg
             =~ /^(?:object-RT::Model::Transaction--)?CustomField-(\d+)/ );
-        next if $arg =~ /-Magic$/;
+        next if $arg =~ /-magic$/;
         my $cfid   = $1;
         my $values = $args->{$arg};
         foreach my $value (

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 Feb  3 17:58:32 2008
@@ -137,7 +137,7 @@
 	elsif ($class eq 'CustomFields') {
 	    my $values = $obj->values;
 	    while (my $value = $values->next) {
-		push @{$rv->{Values}}, {
+		push @{$rv->{values}}, {
 		    map { ($_ => $value->__value($_)) } qw(
 			name description sort_order
 		    ),
@@ -159,7 +159,7 @@
 
 print(<< ".");
 no strict; use XML::Simple; *_ = XMLin(do { local \$/; readline(DATA) }, ForceArray => [qw(
- @classes Values
+ @classes values
 )], NoAttr => 1, SuppressEmpty => ''); *\$_ = (\$_{\$_} || []) for keys \%_; 1; # vim: ft=xml
 __DATA__
 .

Modified: rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t	Sun Feb  3 17:58:32 2008
@@ -38,7 +38,7 @@
         $m->submit_form(
             form_name => "ModifyCustomField",
             fields => {
-                "CustomField-". $cfid ."-Value-new-name" => $value,
+                "CustomField-". $cfid ."-value-new-name" => $value,
             },
             button => 'Update',
         );
@@ -94,14 +94,13 @@
     $m->title_like(qr/Modify ticket/i, 'modify ticket');
     $m->content_like(qr/\Q$cf_name/, 'CF on the page');
 
-    my $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-Values");
+    my $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-values");
     is lc $value, 'asd', 'correct value is selected';
     $m->submit;
     $m->content_unlike(qr/\Q$cf_name\E.*?changed/mi, 'field is not changed');
 
-    $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-Values");
+    $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-values");
     is lc $value, 'asd', 'the same value is still selected';
-
     my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
     $ticket->load( $tid );
     ok $ticket->id, 'loaded the ticket';
@@ -117,14 +116,14 @@
     $m->title_like(qr/Modify ticket/i, 'modify ticket');
     $m->content_like(qr/\Q$cf_name/, 'CF on the page');
 
-    my $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-Values");
+    my $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-values");
     is lc $value, 'asd', 'correct value is selected';
-    $m->select("object-RT::Model::Ticket-$tid-CustomField-$cfid-Values" => 0 );
+    $m->select("object-RT::Model::Ticket-$tid-CustomField-$cfid-values" => 0 );
     $m->submit;
     $m->content_like(qr/\Q$cf_name\E.*?changed/mi, 'field is changed');
     $m->content_unlike(qr/0 is no longer a value for custom field/mi, 'no bad message in results');
 
-    $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-Values");
+    $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-values");
     is lc $value, '0', 'new value is selected';
 
     my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
@@ -142,13 +141,13 @@
     $m->title_like(qr/Modify ticket/i, 'modify ticket');
     $m->content_like(qr/\Q$cf_name/, 'CF on the page');
 
-    my $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-Values");
+    my $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-values");
     is lc $value, '0', 'correct value is selected';
-    $m->select("object-RT::Model::Ticket-$tid-CustomField-$cfid-Values" => '' );
+    $m->select("object-RT::Model::Ticket-$tid-CustomField-$cfid-values" => '' );
     $m->submit;
     $m->content_like(qr/0 is no longer a value for custom field/mi, '0 is no longer a value');
 
-    $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-Values");
+    $value = $m->form_number(3)->value("object-RT::Model::Ticket-$tid-CustomField-$cfid-values");
     is $value, '', '(no value) is selected';
 
     my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );


More information about the Rt-commit mailing list