some minor fixes
This commit is contained in:
parent
f93a42330d
commit
babbbed4c9
1 changed files with 18 additions and 3 deletions
|
|
@ -300,10 +300,15 @@ sub drawRelatedRibbonsField {
|
||||||
|
|
||||||
sub drawStatusField {
|
sub drawStatusField {
|
||||||
my ($self, $params) = @_;
|
my ($self, $params) = @_;
|
||||||
|
my $options = $self->ems->getSubmissionStatus;
|
||||||
|
my $currentStatus = $self->get('submissionStatus');
|
||||||
|
for my $key ( qw/pending created failed/ ) {
|
||||||
|
delete $options->{$key} unless $currentStatus eq $key;
|
||||||
|
}
|
||||||
return WebGUI::Form::SelectBox($self->session, {
|
return WebGUI::Form::SelectBox($self->session, {
|
||||||
name => 'submissionStatus',
|
name => 'submissionStatus',
|
||||||
value => $self->get('submissionStatus'),
|
value => $currentStatus,
|
||||||
options => $self->ems->getSubmissionStatus,
|
options => $options,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -433,6 +438,9 @@ sub www_editSubmission {
|
||||||
}
|
}
|
||||||
|
|
||||||
# for each field
|
# for each field
|
||||||
|
if( $fields->{submissionStatus}{value} eq 'created' ) {
|
||||||
|
$formDescription = { } ; # no editable fields once the ticket is created.
|
||||||
|
}
|
||||||
for my $fieldId ( @fieldNames ) {
|
for my $fieldId ( @fieldNames ) {
|
||||||
my $field = $fields->{$fieldId};
|
my $field = $fields->{$fieldId};
|
||||||
if( $formDescription->{$field->{fieldId}} || $asset->ems->isRegistrationStaff ) {
|
if( $formDescription->{$field->{fieldId}} || $asset->ems->isRegistrationStaff ) {
|
||||||
|
|
@ -445,10 +453,17 @@ sub www_editSubmission {
|
||||||
|
|
||||||
$newform->dynamicField(%$field);
|
$newform->dynamicField(%$field);
|
||||||
} else {
|
} else {
|
||||||
|
my $value;
|
||||||
# TODO see that the data gets formatted
|
# TODO see that the data gets formatted
|
||||||
|
if( $fieldId eq 'submissionStatus' ) {
|
||||||
|
$value = $field->{value} || 'pending';
|
||||||
|
$value = $i18n->get($value);
|
||||||
|
} else {
|
||||||
|
$value = $field->{value} || '[ ]';
|
||||||
|
}
|
||||||
$newform->readOnly(
|
$newform->readOnly(
|
||||||
label => $field->{label},
|
label => $field->{label},
|
||||||
value => $field->{value} || '[ ]',
|
value => $value,
|
||||||
fieldId => $field->{fieldId},
|
fieldId => $field->{fieldId},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue