diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm index abeac83d4..eb718386a 100644 --- a/lib/WebGUI/AssetPackage.pm +++ b/lib/WebGUI/AssetPackage.pm @@ -357,7 +357,10 @@ sub www_importPackage { my $error = ""; if ($storage->getFileExtension($storage->getFiles->[0]) eq "wgpkg") { - $error = $self->importPackage($storage, {inheritPermissions => $inheritPermissions}); + $error = $self->importPackage($storage, { + inheritPermissions => $inheritPermissions, + clearPackageFlag => $self->session->form->process('clearPackageFlag'), + }); } if (!blessed $error) { my $i18n = WebGUI::International->new($self->session, "Asset"); diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index 5b94b66c6..d2e9c2a90 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -475,6 +475,8 @@ EOHTML . WebGUI::Form::hidden($session, {name=>"func", value=>"importPackage"}) . '
' . '
' + . WebGUI::Form::checkbox($session, { label => $i18n->get('clear package flag'), checked => 0, name => 'clearPackageFlag', value => 1 }) + . '
' . WebGUI::Form::checkbox($session, { label => $i18n->get('inherit parent permissions'), checked => 1, name => 'inheritPermissions', value => 1 }) . '   ' . WebGUI::Form::submit($session, { value=>$i18n->get("import"), 'extras' => ' ' }) . '
' diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index 184bfaa04..7325b7630 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -1271,6 +1271,12 @@ Couldn't open %-s because %-s
context => q{Error message in Asset.pm}, }, + 'clear package flag' => { + message => q{Clear package flag}, + lastUpdate => 1275419384, + context => q{Package import option in admin console}, + }, + 'need a userId parameter' => { message => q{need a userId parameter}, lastUpdated => 0,