From da9f836232cf94e7ebf5c10237a2a9db7703f02f Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 19 Oct 2009 17:55:55 -0700 Subject: [PATCH] Autocommit version tags when using the RTE form control for folder/files. Fixes bug #11138 --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Form/HTMLArea.pm | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index a2d65c2fd..100d929dd 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -26,6 +26,7 @@ - fixed #11147: fail safe template is missing embedded style - fixed #11137: Customers see failed orders - fixed #11156: Syndicated Content doesn't show all headlines in feed + - fixed #11138: RichEdit, upload image does not commit a version tag 7.8.1 - mark $session->datetime->time as deprecated and remove its use from core code diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm index 21505afa4..c830fd817 100644 --- a/lib/WebGUI/Form/HTMLArea.pm +++ b/lib/WebGUI/Form/HTMLArea.pm @@ -386,8 +386,8 @@ sub www_addFolderSave { title => $filename, menuTitle => $filename, url => $base->getUrl.'/'.$filename, - groupIdEdit => $session->form->process('groupIdEdit') || $base->get('groupIdEdit'), - groupIdView => $session->form->process('groupIdView') || $base->get('groupIdView'), + groupIdEdit => $base->get('groupIdEdit'), + groupIdView => $base->get('groupIdView'), ownerUserId => $session->user->userId, startDate => $base->get('startDate'), endDate => $base->get('endDate'), @@ -410,6 +410,7 @@ sub www_addFolderSave { className => 'WebGUI::Asset::Wobject::Folder', #filename => $filename, }); + WebGUI::VersionTag->autoCommitWorkingIfEnabled($session, { allowComments => 0 }); $session->http->setRedirect($base->getUrl('op=formHelper;class=HTMLArea;sub=imageTree')); return undef; } @@ -495,6 +496,7 @@ sub www_addImageSave { $child->update({url => $child->fixUrl}); $child->applyConstraints; } + WebGUI::VersionTag->autoCommitWorkingIfEnabled($session, { allowComments => 0 }); $session->http->setRedirect($base->getUrl('op=formHelper;class=HTMLArea;sub=imageTree')); return undef; }