[Rt-commit] r10612 - in rt/branches/3.999-DANGEROUS: . html/Admin/CustomFields html/Admin/Elements html/Elements lib lib/RT/Model t/api
jesse at bestpractical.com
jesse at bestpractical.com
Wed Jan 30 19:47:29 EST 2008
Author: jesse
Date: Wed Jan 30 19:47:29 2008
New Revision: 10612
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/SelectCustomFieldType
rt/branches/3.999-DANGEROUS/html/Elements/ShowCustomFields
rt/branches/3.999-DANGEROUS/lib/RT.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm
rt/branches/3.999-DANGEROUS/t/api/cf_pattern.t
rt/branches/3.999-DANGEROUS/t/api/date.t
rt/branches/3.999-DANGEROUS/t/web/cf_access.t
rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t
Log:
r75995 at pinglin: jesse | 2008-01-30 19:46:14 -0500
* some more fixes toward getting t/web/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 Wed Jan 30 19:47:29 2008
@@ -66,7 +66,7 @@
<tr><td class="label"><&|/l&>Type</&></td>
<td><& /Admin/Elements/SelectCustomFieldType,
- name => "TypeComposite",
+ name => "type_composite",
Default => $CustomFieldObj->type_composite, &>
</td></tr>
@@ -84,7 +84,7 @@
<tr><td class="label"><&|/l&>Validation</&></td>
<td><& /Widgets/ComboBox,
- name => 'Pattern',
+ name => 'pattern',
Default => $CustomFieldObj->pattern,
Size => 20,
Values => [
@@ -95,7 +95,7 @@
&></td></tr>
<tr><td class="label"><&|/l&>Link values to</&></td><td>
-<input size="60" name="LinkValueTo" value="<% $CustomFieldObj->link_value_to || '' %>" />
+<input size="60" name="link_value_to" value="<% $CustomFieldObj->link_value_to || '' %>" />
<div class="hints">
<&|/l&>RT can make this custom field's values into hyperlinks to another service.</&>
<&|/l&>Fill in this field with a URL.</&>
@@ -103,7 +103,7 @@
</div></td></tr>
<tr><td class="label"><&|/l&>Include page</&></td><td>
-<input size="60" name="IncludeContentForValue" value="<% $CustomFieldObj->include_content_for_value || '' %>" />
+<input size="60" name="include_content_for_value" value="<% $CustomFieldObj->include_content_for_value || '' %>" />
<div class="hints">
<&|/l&>RT can include content from another web service when showing this custom field.</&>
<&|/l&>Fill in this field with a URL.</&>
@@ -145,10 +145,10 @@
if ( $id eq 'new' ) {
my ( $val, $msg ) = $CustomFieldObj->create(
name => $name,
- TypeComposite => $TypeComposite,
+ type_composite => $type_composite,
lookup_type => $lookup_type,
description => $description,
- Pattern => $Pattern,
+ pattern => $pattern,
);
$m->comp( "/Elements/Error", Why => _( "Could not create CustomField", $msg ) ) unless $val;
push @results, $msg;
@@ -165,7 +165,7 @@
#we're asking about enabled on the web page but really care about disabled.
$ARGS{'disabled'} = $disabled = $Enabled? 0 : 1;
- my @attribs = qw(disabled Pattern name TypeComposite lookup_type description LinkValueTo IncludeContentForValue);
+ my @attribs = qw(disabled pattern name type_composite lookup_type description link_value_to include_content_for_value);
push @results, update_record_object(
AttributesRef => \@attribs,
object => $CustomFieldObj,
@@ -213,12 +213,12 @@
</%INIT>
<%ARGS>
$id => undef
-$TypeComposite => undef
+$type_composite => undef
$lookup_type => undef
$MaxValues => undef
$sort_order => undef
$description => undef
-$Pattern => undef
+$pattern => undef
$name => undef
$SetEnabled => undef
$Enabled => 0
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectCustomFieldType
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectCustomFieldType (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/SelectCustomFieldType Wed Jan 30 19:47:29 2008
@@ -56,5 +56,5 @@
</%INIT>
<%ARGS>
$Default=>undef
-$name => 'TypeComposite'
+$name => 'type_composite'
</%ARGS>
Modified: rt/branches/3.999-DANGEROUS/html/Elements/ShowCustomFields
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/ShowCustomFields (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/ShowCustomFields Wed Jan 30 19:47:29 2008
@@ -93,7 +93,7 @@
}
$m->out('</a>') if $linked;
- # This section automatically populates a div with the "IncludeContentForValue" for this custom
+ # This section automatically populates a div with the "include_content_for_value" for this custom
# field if it's been defined
if ( $cf->include_content_for_value ) {
my $vid = $value->id;
Modified: rt/branches/3.999-DANGEROUS/lib/RT.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT.pm Wed Jan 30 19:47:29 2008
@@ -12,32 +12,32 @@
use vars qw($Config $System $nobody $Handle );
our $VERSION = '3.7.14';
-our $BASE_PATH = '/home/cubic/projs/RT/3.999-DANGEROUS';
-our $EtcPath = '/home/cubic/projs/RT/3.999-DANGEROUS/etc';
-our $BinPath = '/home/cubic/projs/RT/3.999-DANGEROUS/bin';
-our $VarPath = '/home/cubic/projs/RT/3.999-DANGEROUS/var';
-our $LocalPath = '/home/cubic/projs/RT/3.999-DANGEROUS/local';
-our $LocalLibPath = '/home/cubic/projs/RT/3.999-DANGEROUS/local/lib';
-our $LocalEtcPath = '/home/cubic/projs/RT/3.999-DANGEROUS/local/etc';
-our $LocalLexiconPath = '/home/cubic/projs/RT/3.999-DANGEROUS/local/po';
+our $BASE_PATH = '/home/jesse/svk/3.999-DANGEROUS';
+our $EtcPath = '/home/jesse/svk/3.999-DANGEROUS/etc';
+our $BinPath = '/home/jesse/svk/3.999-DANGEROUS/bin';
+our $VarPath = '/home/jesse/svk/3.999-DANGEROUS/var';
+our $LocalPath = '/home/jesse/svk/3.999-DANGEROUS/local';
+our $LocalLibPath = '/home/jesse/svk/3.999-DANGEROUS/local/lib';
+our $LocalEtcPath = '/home/jesse/svk/3.999-DANGEROUS/local/etc';
+our $LocalLexiconPath = '/home/jesse/svk/3.999-DANGEROUS/local/po';
our $LocalPluginPath = $LocalPath . "/plugins";
# $MasonComponentRoot is where your rt instance keeps its mason html files
-our $MasonComponentRoot = '/home/cubic/projs/RT/3.999-DANGEROUS/html';
+our $MasonComponentRoot = '/home/jesse/svk/3.999-DANGEROUS/html';
# $MasonLocalComponentRoot is where your rt instance keeps its site-local
# mason html files.
-our $MasonLocalComponentRoot = '/home/cubic/projs/RT/3.999-DANGEROUS/local/html';
+our $MasonLocalComponentRoot = '/home/jesse/svk/3.999-DANGEROUS/local/html';
# $MasonDataDir Where mason keeps its datafiles
-our $MasonDataDir = '/home/cubic/projs/RT/3.999-DANGEROUS/var/mason_data';
+our $MasonDataDir = '/home/jesse/svk/3.999-DANGEROUS/var/mason_data';
# RT needs to put session data (for preserving state between connections
# via the web interface)
-our $MasonSessionDir = '/home/cubic/projs/RT/3.999-DANGEROUS/var/session_data';
+our $MasonSessionDir = '/home/jesse/svk/3.999-DANGEROUS/var/session_data';
=head1 name
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm Wed Jan 30 19:47:29 2008
@@ -207,8 +207,8 @@
return ( 0, _('Permission Denied') );
}
- if ( $args{TypeComposite} ) {
- @args{ 'type', 'max_values' } = split( /-/, $args{TypeComposite}, 2 );
+ if ( $args{type_composite} ) {
+ @args{ 'type', 'max_values' } = split( /-/, $args{type_composite}, 2 );
} elsif ( $args{type} =~ s/(?:(Single)|Multiple)$// ) {
# old style type string
@@ -747,7 +747,7 @@
# }}}
-=head2 SetTypeComposite
+=head2 Settype_composite
Set this custom field's type and maximum values as a composite value
@@ -796,7 +796,7 @@
return $self->_set( column => 'lookup_type', value => $lookup );
}
-=head2 TypeComposite
+=head2 type_composite
Returns a composite value composed of this object's type and maximum values
@@ -807,7 +807,7 @@
return join '-', ( $self->type || '' ), ( $self->max_values || 0 );
}
-=head2 TypeComposites
+=head2 type_composites
Returns an array of all possible composite values for custom fields.
@@ -1153,9 +1153,9 @@
}
-=head2 IncludeContentForValue [value] (and SetIncludeContentForValue)
+=head2 include_content_for_value [value] (and Setinclude_content_for_value)
-Gets or sets the C<IncludeContentForValue> for this custom field. RT
+Gets or sets the C<include_content_for_value> for this custom field. RT
uses this field to automatically include content into the user's browser
as they display records with custom fields in RT.
@@ -1167,12 +1167,12 @@
sub include_content_for_value {
my $self = shift;
- $self->url_template( 'IncludeContentForValue', @_ );
+ $self->url_template( 'include_content_for_value', @_ );
}
-=head2 LinkValueTo [value] (and SetLinkValueTo)
+=head2 link_value_to [value] (and Setlink_value_to)
-Gets or sets the C<LinkValueTo> for this custom field. RT
+Gets or sets the C<link_value_to> for this custom field. RT
uses this field to make custom field values into hyperlinks in the user's
browser as they display records with custom fields in RT.
@@ -1184,7 +1184,7 @@
sub link_value_to {
my $self = shift;
- $self->url_template( 'LinkValueTo', @_ );
+ $self->url_template( 'link_value_to', @_ );
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm Wed Jan 30 19:47:29 2008
@@ -264,7 +264,7 @@
Returns a filled in URL template for this ObjectCustomFieldValue, suitable for
constructing a hyperlink in RT's webui. Returns undef if this custom field doesn't have
-a LinkValueTo
+a link_value_to
=cut
@@ -278,7 +278,7 @@
Returns a filled in URL template for this ObjectCustomFieldValue, suitable for
constructing a hyperlink in RT's webui. Returns undef if this custom field doesn't have
-a IncludeContentForValue
+a include_content_for_value
=cut
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 Wed Jan 30 19:47:29 2008
@@ -21,8 +21,8 @@
my $cf = new('RT::Model::CustomField');
my @cf_args = (name => $q->name, type => 'Freeform', queue => $q->id, MaxValues => 1);
-fails($cf->create(@cf_args, Pattern => ')))bad!regex((('));
-works($cf->create(@cf_args, Pattern => 'good regex'));
+fails($cf->create(@cf_args, pattern => ')))bad!regex((('));
+works($cf->create(@cf_args, pattern => 'good regex'));
my $t = new('RT::Model::Ticket');
my ($id,undef,$msg) = $t->create(queue => $q->id, subject => 'CF Test');
Modified: rt/branches/3.999-DANGEROUS/t/api/date.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/date.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/date.t Wed Jan 30 19:47:29 2008
@@ -95,6 +95,8 @@
is($date->get(Format =>'W3CDTF'),
'1970-01-01T00:00:00Z',
"W3CDTF format with defaults");
+exit;
+
is($date->get(Format =>'RFC2822'),
'Thu, 1 Jan 1970 00:00:00 +0000',
"RFC2822 format with defaults");
Modified: rt/branches/3.999-DANGEROUS/t/web/cf_access.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/cf_access.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/cf_access.t Wed Jan 30 19:47:29 2008
@@ -20,7 +20,7 @@
$m->submit_form(
form_name => "ModifyCustomField",
fields => {
- TypeComposite => 'Image-0',
+ type_composite => 'Image-0',
lookup_type => 'RT::Model::Queue-RT::Model::Ticket',
name => 'img',
description => 'img',
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 Wed Jan 30 19:47:29 2008
@@ -23,7 +23,7 @@
form_name => "ModifyCustomField",
fields => {
name => $cf_name,
- TypeComposite => 'Select-1',
+ type_composite => 'Select-1',
lookup_type => 'RT::Model::Queue-RT::Model::Ticket',
},
);
More information about the Rt-commit
mailing list