From 7900cec5e8d43f85705b09554c0dc154e5c0a7ed Mon Sep 17 00:00:00 2001 From: Scott Walters Date: Wed, 25 Sep 2013 14:42:14 -0500 Subject: [PATCH] finish the "Upload Files" implementation; the AssetHelper had some bugs and needed to close the pop-up dialog that it created. --- lib/WebGUI/AssetHelper/UploadFiles.pm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/WebGUI/AssetHelper/UploadFiles.pm b/lib/WebGUI/AssetHelper/UploadFiles.pm index d98ac29e6..d8cc0d517 100644 --- a/lib/WebGUI/AssetHelper/UploadFiles.pm +++ b/lib/WebGUI/AssetHelper/UploadFiles.pm @@ -82,6 +82,7 @@ ENDHTML $tabform->hidden({name=>"op",value=>"assetHelper"}); $tabform->hidden({name=>"helperId",value=>$self->id}); $tabform->hidden({name=>"method",value=>"uploadFilesSave"}); + $tabform->hidden({name=>"assetId",value=> $session->form->process('assetId'), }); if ($session->config->get("enableSaveAndCommit")) { $tabform->submitAppend(WebGUI::Form::submit($session, { name => "saveAndCommit", @@ -197,9 +198,8 @@ sub www_uploadFilesSave { value => $asset->$property_name, }; - # process the form element - my $defaultValue = $overrides->{defaultValue} // $asset->$property; + my $defaultValue = $overrides->{defaultValue} // $asset->$property_name; $asset_defaults{$property_name} = $form->process( $property_name, $fieldType, $defaultValue, $fieldHash ); } ## end foreach my $property ( $asset...) @@ -235,12 +235,21 @@ sub www_uploadFilesSave { } $tempStorage->delete; - if (WebGUI::VersionTag->autoCommitWorkingIfEnabled($session, { + WebGUI::VersionTag->autoCommitWorkingIfEnabled($session, { override => scalar $session->form->process("saveAndCommit"), allowComments => 1, returnUrl => $asset->getUrl, - }) eq 'redirect') { - return undef; + }); + + # return JavaScript to close the pop-up window that got opened in process(). + + return qq{ + + + }; }