oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Dataform adding fields without filename

Browse source
This commit is contained in:
Wouter van Oijen 2006-07-21 13:25:28 +00:00
parent d37cd047e3
commit 1fe73fa764
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -10,6 +10,7 @@
- fix: HttpProxy not working (with fix) (Eric Kennedy) - fix: HttpProxy not working (with fix) (Eric Kennedy)
- fix: Copyright on Default Template (Wouter van Oijen / ProcoliX) - fix: Copyright on Default Template (Wouter van Oijen / ProcoliX)
- fix: FileUrl macro doesn't handle snippets (Wouter van Oijen / ProcoliX) - fix: FileUrl macro doesn't handle snippets (Wouter van Oijen / ProcoliX)
- fix: Dataform adding fields without fieldname (Wouter van Oijen / ProcoliX)
7.0.2 7.0.2

38
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -902,32 +902,32 @@ sub www_editField {
sub www_editFieldSave { sub www_editFieldSave {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
$self->session->form->process("name") = $self->session->form->process("label") if ($self->session->form->process("name") eq ""); my $form = $self->session->form;
my $tid = $self->session->form->process("tid", 'selectBox') || "0"; my $tid = $form->process("tid", 'selectBox') || "0";
my $name = $self->session->url->urlize($self->session->form->process("name")); my $name = $self->session->url->urlize($form->process("name") || $form->process("label"));
$name =~ s/\-//g; $name =~ s/\-//g;
$name =~ s/\///g; $name =~ s/\///g;
$self->setCollateral("DataForm_field","DataForm_fieldId",{ $self->setCollateral("DataForm_field","DataForm_fieldId",{
DataForm_fieldId=>$self->session->form->process("fid"), DataForm_fieldId=>$form->process("fid"),
width=>$self->session->form->process("width", 'integer'), width=>$form->process("width", 'integer'),
name=>$name, name=>$name,
label=>$self->session->form->process("label"), label=>$form->process("label"),
DataForm_tabId=>$tid, DataForm_tabId=>$tid,
status=>$self->session->form->process("status", 'selectBox'), status=>$form->process("status", 'selectBox'),
type=>$self->session->form->process("type", 'fieldType'), type=>$form->process("type", 'fieldType'),
possibleValues=>$self->session->form->process("possibleValues", 'textarea'), possibleValues=>$form->process("possibleValues", 'textarea'),
defaultValue=>$self->session->form->process("defaultValue", 'textarea'), defaultValue=>$form->process("defaultValue", 'textarea'),
subtext=>$self->session->form->process("subtext"), subtext=>$form->process("subtext"),
rows=>$self->session->form->process("rows", 'integer'), rows=>$form->process("rows", 'integer'),
vertical=>$self->session->form->process("vertical", 'yesNo'), vertical=>$form->process("vertical", 'yesNo'),
extras=>$self->session->form->process("extras"), extras=>$form->process("extras"),
}, "1","1", _tonull("DataForm_tabId",$tid)); }, "1","1", _tonull("DataForm_tabId",$tid));
if($self->session->form->process("position")) { if($form->process("position")) {
$self->session->db->write("update DataForm_field set sequenceNumber=".$self->session->db->quote($self->session->form->process("position", 'integer')). $self->session->db->write("update DataForm_field set sequenceNumber=".$self->session->db->quote($form->process("position", 'integer')).
" where DataForm_fieldId=".$self->session->db->quote($self->session->form->process("fid"))); " where DataForm_fieldId=".$self->session->db->quote($form->process("fid")));
} }
$self->reorderCollateral("DataForm_field","DataForm_fieldId", _tonull("DataForm_tabId",$tid)) if ($self->session->form->process("fid") ne "new"); $self->reorderCollateral("DataForm_field","DataForm_fieldId", _tonull("DataForm_tabId",$tid)) if ($form->process("fid") ne "new");
if ($self->session->stow->get('whatNext') eq "editField" || $self->session->form->process("proceed") eq "editField") { if ($self->session->stow->get('whatNext') eq "editField" || $form->process("proceed") eq "editField") {
return $self->www_editField('new'); return $self->www_editField('new');
} }
return ""; return "";