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

importing a package didn't follow auto commit settings

Browse source
This commit is contained in:
Graham Knop 2007-09-07 18:55:56 +00:00
parent c7c7c4e605
commit 0a829e5da7
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@
- Inbox messages sent by Data Forms add sent by user - Inbox messages sent by Data Forms add sent by user
- Hide encryption settings for edit branch when SSL disabled - Hide encryption settings for edit branch when SSL disabled
- fix: Edit Branch doesn't follow auto commit settings - fix: Edit Branch doesn't follow auto commit settings
- fix: Importing a package doesn't follow auto commit settings
7.4.5 7.4.5
- fix: Apostrophy incorrectly escaped as double quote in some places - fix: Apostrophy incorrectly escaped as double quote in some places

9
lib/WebGUI/AssetPackage.pm
View file

@ -198,7 +198,14 @@ sub importPackage {
my $newAsset = $asset->importAssetData($data); my $newAsset = $asset->importAssetData($data);
$assets{$newAsset->getId} = $newAsset; $assets{$newAsset->getId} = $newAsset;
} }
return undef; if ($self->session->setting->get("autoRequestCommit")) {
if ($self->session->setting->get("skipCommitComments")) {
WebGUI::VersionTag->getWorking($self->session)->requestCommit;
} else {
$self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
}
}
return undef;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------