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

fix two bugs in DataForm

Browse source
This commit is contained in:
Colin Kuskie 2005-03-16 03:33:38 +00:00
parent 5e356b2076
commit 75e86e4d31
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/6.x.x.txt
View file

@ -19,7 +19,8 @@
- fix [ 1150140 ] Manage users in group only views first page - fix [ 1150140 ] Manage users in group only views first page
- fix [ 1163470 ] [6.5.1CVS] Dataform, wrong template, bad edit URL - fix [ 1163470 ] [6.5.1CVS] Dataform, wrong template, bad edit URL
- fix [ 1159992 ] Integer value zero not returned in form fields - fix [ 1159992 ] Integer value zero not returned in form fields
- fix [ 1161457 ] Data fomr - list all entries: Logfile Error
- fix [ 1161461 ] Data form - Add field - wrong destination
6.5.1 6.5.1
- Fixed a bug in the lineage tree that caused funky ranks to be created when - Fixed a bug in the lineage tree that caused funky ranks to be created when

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

@ -606,7 +606,7 @@ sub view {
my $var; my $var;
$var->{entryId} = $session{form}{entryId} if ($self->canEdit); $var->{entryId} = $session{form}{entryId} if ($self->canEdit);
if ($var->{entryId} eq "list" && $self->canEdit) { if ($var->{entryId} eq "list" && $self->canEdit) {
return $self->processTemplate($self->getListTemplateVars,"DataForm/List",$self->get("listTemplateId")); return $self->processTemplate($self->getListTemplateVars,$self->get("listTemplateId"));
} }
# add Tab StyleSheet and JavaScript # add Tab StyleSheet and JavaScript
WebGUI::Style::setLink($session{config}{extrasURL}.'/tabs/tabs.css', {"type"=>"text/css"}); WebGUI::Style::setLink($session{config}{extrasURL}.'/tabs/tabs.css', {"type"=>"text/css"});
@ -792,6 +792,10 @@ sub www_editFieldSave {
" where DataForm_fieldId=".quote($session{form}{fid})); " where DataForm_fieldId=".quote($session{form}{fid}));
} }
$self->reorderCollateral("DataForm_field","DataForm_fieldId", _tonull("DataForm_tabId",$session{form}{tid})) if ($session{form}{fid} ne "new"); $self->reorderCollateral("DataForm_field","DataForm_fieldId", _tonull("DataForm_tabId",$session{form}{tid})) if ($session{form}{fid} ne "new");
if ($session{form}{proceed} eq "editField") {
$session{form}{fid} = "new";
return $self->www_editField;
}
return ""; return "";
} }
@ -848,6 +852,10 @@ sub www_editTabSave {
label=>$session{form}{label}, label=>$session{form}{label},
subtext=>$session{form}{subtext} subtext=>$session{form}{subtext}
}); });
if ($session{form}{proceed} eq "editTab") {
$session{form}{tid} = "new";
return $self->www_editTab;
}
return ""; return "";
} }
@ -960,7 +968,7 @@ sub www_process {
$self->www_view($var); $self->www_view($var);
} else { } else {
$self->sendEmail($var) if ($self->get("mailData") && !$updating); $self->sendEmail($var) if ($self->get("mailData") && !$updating);
return WebGUI::Style::process($self->processTemplate($var,"DataForm",$self->get("acknowlegementTemplateId")),$self->get("styleTemplateId")); return WebGUI::Style::process($self->processTemplate($var,$self->get("acknowlegementTemplateId")),$self->get("styleTemplateId"));
} }
} }