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

make Form::Cancel better; make WebGUI::TabForm use it. so, logic migrated from TabForm to Form::Cancel where it's re-usable and fixed up for this new Doug admin.

Browse source
This commit is contained in:
Scott Walters 2013-09-26 17:28:27 -05:00
parent 7b7f3be628
commit 0b5a77515f
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Form/Cancel.pm
View file

@ -47,7 +47,7 @@ sub new {
my $cancelURL = $session->request->referer;
my $cancelJS_fragment = $cancelURL ? sprintf("window.location.href='%s'", $cancelURL) : ' history.go(-1)';
my $cancelJS = q{
if( window.parent && window.parent.admin window.parent.admin.modalDialog ) {
if( window.parent && window.parent.admin && window.parent.admin.modalDialog ) {
window.parent.admin.closeModalDialog();
} else {
$cancelJS_fragment;

5
lib/WebGUI/TabForm.pm
View file

@ -209,10 +209,7 @@ sub new {
if (my $cancelURL = $session->request->referer) {
$cancelJS = sprintf q{window.location.href='%s';}, $cancelURL;
}
my $cancel = WebGUI::Form::button($session,{
value=>$i18n->get('cancel'),
extras=>sprintf(q|onclick="%s" class="backwardButton"|, $cancelJS),
});
my $cancel = WebGUI::Form::cancel($session);
bless { _session=>$session, _cancel=>$cancel, _submit=>WebGUI::Form::submit($session),
_form=>WebGUI::Form::formHeader($session), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class;
}