X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FEditCustomField;h=db6d18180d2820841a6db695d571ac71a5e95e18;hb=9aee669886202be7035e6c6049fc71bc99dd3013;hp=d0928dc9a2f637d2789a61ac3d02e467c3e08870;hpb=919e930aa9279b3c5cd12b593889cd6de79d67bf;p=freeside.git
diff --git a/rt/share/html/Elements/EditCustomField b/rt/share/html/Elements/EditCustomField
index d0928dc9a..db6d18180 100644
--- a/rt/share/html/Elements/EditCustomField
+++ b/rt/share/html/Elements/EditCustomField
@@ -55,25 +55,39 @@ unless ( $Type ) {
}
my $Values;
-if ( $Object && $Object->id ) {
- $NamePrefix ||= join '-',
- 'Object', ref($Object), $Object->Id, 'CustomField', '';
+if ( $Object ) {
+ $Grouping =~ s/\W//g if $Grouping;
- $Values = $Object->CustomFieldValues( $CustomField->id );
- $Values->Columns(
- qw( id CustomField ObjectType ObjectId Disabled Content
- ContentType ContentEncoding SortOrder Creator Created
- LastUpdatedBy LastUpdated )
- );
- # Don't take care of $Values if there isn't values inside
- undef ( $Values ) unless ( $Values->Count );
+ if ( $Object->Id ) {
+ $Values = $Object->CustomFieldValues( $CustomField->id );
+ $Values->Columns(
+ qw( id CustomField ObjectType ObjectId Disabled Content
+ ContentType ContentEncoding SortOrder Creator Created
+ LastUpdatedBy LastUpdated )
+ );
+ # Don't take care of $Values if there isn't values inside
+ undef ( $Values ) unless ( $Values->Count );
+ }
+}
+
+my $Name;
+if ( !$NamePrefix ) {
+ $Name = GetCustomFieldInputName(Object => $Object, CustomField => $CustomField, Grouping => $Grouping );
}
# Always fill $Default with submited values if it's empty
if ( ( !defined $Default || !length $Default ) && $DefaultsFromTopArguments ) {
my %TOP = %$DECODED_ARGS;
- $Default = $TOP{ $NamePrefix .$CustomField->Id . '-Values' }
- || $TOP{ $NamePrefix .$CustomField->Id . '-Value' };
+ $Default = $TOP{ $Name } if $Name;
+ # check both -Values and -Value for back compatibility
+ if ( $NamePrefix ) {
+ $Default //= $TOP{ $NamePrefix . $CustomField->Id . '-Values' }
+ // $TOP{ $NamePrefix . $CustomField->Id . '-Value' };
+ }
+ else {
+ my $prefix = GetCustomFieldInputNamePrefix(Object => $Object, CustomField => $CustomField, Grouping => $Grouping );
+ $Default //= $TOP{ $prefix . 'Values' } // $TOP{ $prefix . 'Value' };
+ }
}
my $MaxValues = $CustomField->MaxValues;
@@ -85,10 +99,13 @@ if ($MaxValues == 1 && $Values) {
}
# 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".''."\n");
+$m->out("\n".''."\n");
+
my $EditComponent = "EditCustomField$Type";
-$m->callback( %ARGS, CallbackName => 'EditComponentName', Name => \$EditComponent, CustomField => $CustomField, Object => $Object );
+$m->callback( %ARGS, CallbackName => 'EditComponentName', Name => \$EditComponent, CustomField => $CustomField, Object => $Object, Rows => \$Rows, Cols => \$Cols);
$EditComponent = "EditCustomField$Type" unless $m->comp_exists($EditComponent);
return $m->comp(
@@ -103,9 +120,12 @@ return $m->comp(
Multiple => ($MaxValues != 1),
NamePrefix => $NamePrefix,
CustomField => $CustomField,
+ Name => $Name,
+ $CustomField->BasedOn && $Name ? ( BasedOnName => GetCustomFieldInputName(Object => $Object, CustomField => $CustomField->BasedOnObj, Grouping => $Grouping) ) : (),
);
%INIT>
<%ARGS>
+$Grouping => undef
$Object => undef
$CustomField => undef
$NamePrefix => undef