removed definition from getEditForm
This commit is contained in:
parent
0e94b4a783
commit
7f474ed7bc
1 changed files with 32 additions and 48 deletions
|
|
@ -831,26 +831,25 @@ sub getEditForm {
|
||||||
}
|
}
|
||||||
|
|
||||||
# build the definition to the generate form
|
# build the definition to the generate form
|
||||||
my (%extendedProperties,@definitions);
|
|
||||||
my @properties = (
|
my @properties = (
|
||||||
assetId => {
|
assetId => {
|
||||||
fieldType => "guid",
|
fieldType => "guid",
|
||||||
label => $i18n->get("asset id"),
|
label => ["asset id",'Asset'],
|
||||||
value => $assetId,
|
value => $assetId,
|
||||||
hoverHelp => $i18n->get('asset id description'),
|
hoverHelp => ['asset id description','Asset'],
|
||||||
uiLevel => 9,
|
uiLevel => 9,
|
||||||
tab => "meta",
|
tab => "meta",
|
||||||
},
|
},
|
||||||
class => {
|
class => {
|
||||||
fieldType => "className",
|
fieldType => "className",
|
||||||
label => $i18n->get("class name",'WebGUI'),
|
label => ["class name",'WebGUI'],
|
||||||
value => $class,
|
value => $class,
|
||||||
uiLevel => 9,
|
uiLevel => 9,
|
||||||
tab => "meta",
|
tab => "meta",
|
||||||
},
|
},
|
||||||
keywords => {
|
keywords => {
|
||||||
label => $i18n->get('keywords'),
|
label => ['keywords','Asset'],
|
||||||
hoverHelp => $i18n->get('keywords help'),
|
hoverHelp => ['keywords help','Asset'],
|
||||||
value => $self->get('keywords'),
|
value => $self->get('keywords'),
|
||||||
fieldType => 'keywords',
|
fieldType => 'keywords',
|
||||||
tab => 'meta',
|
tab => 'meta',
|
||||||
|
|
@ -883,7 +882,7 @@ sub getEditForm {
|
||||||
}
|
}
|
||||||
# add metadata management
|
# add metadata management
|
||||||
if ($session->user->isAdmin) {
|
if ($session->user->isAdmin) {
|
||||||
$extendedProperties{_metadatamanagement} = {
|
push @properties, '_metadatamanagement' => {
|
||||||
tab => "meta",
|
tab => "meta",
|
||||||
fieldType => "readOnly",
|
fieldType => "readOnly",
|
||||||
value => '<p><a href="'.$self->session->url->page("func=editMetaDataField;fid=new").'">'.$i18n->get('Add new field').'</a></p>',
|
value => '<p><a href="'.$self->session->url->page("func=editMetaDataField;fid=new").'">'.$i18n->get('Add new field').'</a></p>',
|
||||||
|
|
@ -891,51 +890,36 @@ sub getEditForm {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
push @definitions, {
|
|
||||||
properties => \%extendedProperties
|
|
||||||
};
|
|
||||||
|
|
||||||
# generate the form
|
# generate the form
|
||||||
foreach my $definition (@definitions) {
|
for (my $i = 0; $i < @properties; $i += 2) {
|
||||||
my $properties = $definition->{properties};
|
my $fieldName = $properties[$i];
|
||||||
|
my %fieldHash = %{$properties[$i+1]};
|
||||||
|
my %params = (name => $fieldName, value => $self->get($fieldName));
|
||||||
|
|
||||||
foreach my $fieldName (keys %{$properties}) {
|
# apply config file changes
|
||||||
my %fieldHash = %{$properties->{$fieldName}};
|
foreach my $key (keys %{$overrides->{fields}{$fieldName}}) {
|
||||||
my %params = (name => $fieldName, value => $self->getValue($fieldName));
|
$fieldHash{$key} = $overrides->{fields}{$fieldName}{$key};
|
||||||
next if exists $fieldHash{autoGenerate} and not $fieldHash{autoGenerate};
|
|
||||||
|
|
||||||
# apply config file changes
|
|
||||||
foreach my $key (keys %{$overrides->{fields}{$fieldName}}) {
|
|
||||||
$fieldHash{$key} = $overrides->{fields}{$fieldName}{$key};
|
|
||||||
}
|
|
||||||
|
|
||||||
# Kludge.
|
|
||||||
if (isIn($fieldHash{fieldType}, 'selectBox', 'workflow') and ref $params{value} ne 'ARRAY') {
|
|
||||||
$params{value} = [$params{value}];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (exists $fieldHash{visible} and not $fieldHash{visible}) {
|
|
||||||
$params{fieldType} = 'hidden';
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
%params = (%params, %fieldHash);
|
|
||||||
delete $params{tab};
|
|
||||||
}
|
|
||||||
|
|
||||||
# if there isnt a tab specified lets define one
|
|
||||||
my $tab = $fieldHash{tab} || "properties";
|
|
||||||
|
|
||||||
# use a custom draw method
|
|
||||||
my $drawMethod = $properties->{$fieldName}{customDrawMethod};
|
|
||||||
if ($drawMethod) {
|
|
||||||
$params{value} = $self->$drawMethod(\%params);
|
|
||||||
delete $params{name}; # don't want readOnly to generate a hidden field
|
|
||||||
$params{fieldType} = "readOnly";
|
|
||||||
}
|
|
||||||
|
|
||||||
#draw the field
|
|
||||||
$tabform->getTab($tab)->dynamicField(%params);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Kludge.
|
||||||
|
if (isIn($fieldHash{fieldType}, 'selectBox', 'workflow') and ref $params{value} ne 'ARRAY') {
|
||||||
|
$params{value} = [$params{value}];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (exists $fieldHash{visible} and not $fieldHash{visible}) {
|
||||||
|
$params{fieldType} = 'hidden';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
%params = (%params, %fieldHash);
|
||||||
|
delete $params{tab};
|
||||||
|
}
|
||||||
|
|
||||||
|
# if there isnt a tab specified lets define one
|
||||||
|
my $tab = $fieldHash{tab} || "properties";
|
||||||
|
|
||||||
|
#draw the field
|
||||||
|
$tabform->getTab($tab)->dynamicField(%params);
|
||||||
}
|
}
|
||||||
|
|
||||||
# send back the rendered form
|
# send back the rendered form
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue