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

Use a fresh copy of the DataForm after doing autocommits for move and delete.

Browse source
This commit is contained in:
Colin Kuskie 2009-09-17 12:02:30 -07:00
parent b09a153688
commit 7349cf52b8
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -1344,7 +1344,8 @@ sub www_deleteFieldConfirm {
$newSelf->deleteField($self->session->form->process("fieldName")); $newSelf->deleteField($self->session->form->process("fieldName"));
$newSelf->{_mode} = 'form'; $newSelf->{_mode} = 'form';
WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session); WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
return $newSelf->www_view; my $freshSelf = $newSelf->cloneFromDb();
return $freshSelf->www_view;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -1368,7 +1369,8 @@ sub www_deleteTabConfirm {
$newSelf->deleteTab($self->session->form->process("tabId")); $newSelf->deleteTab($self->session->form->process("tabId"));
$newSelf->{_mode} = 'form'; $newSelf->{_mode} = 'form';
WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session); WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
return $newSelf->www_view; my $freshSelf = $newSelf->cloneFromDb();
return $freshSelf->www_view;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -1588,11 +1590,12 @@ sub www_editFieldSave {
} }
WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session); WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
my $freshSelf = $newSelf->cloneFromDb();
if ($form->process("proceed") eq "editField") { if ($form->process("proceed") eq "editField") {
return $newSelf->www_editField('new'); return $freshSelf->www_editField('new');
} }
$newSelf->{_mode} = 'form'; $freshSelf->{_mode} = 'form';
return $newSelf->www_view; return $freshSelf->www_view;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -1828,7 +1831,8 @@ sub www_moveFieldDown {
my $fieldName = $self->session->form->process('fieldName'); my $fieldName = $self->session->form->process('fieldName');
$newSelf->moveFieldDown($fieldName); $newSelf->moveFieldDown($fieldName);
WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session); WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
return $newSelf->www_view; my $freshSelf = $newSelf->cloneFromDb();
return $freshSelf->www_view;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -1885,7 +1889,8 @@ sub www_moveFieldUp {
my $fieldName = $self->session->form->process('fieldName'); my $fieldName = $self->session->form->process('fieldName');
$newSelf->moveFieldUp($fieldName); $newSelf->moveFieldUp($fieldName);
WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session); WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
return $newSelf->www_view; my $freshSelf = $newSelf->cloneFromDb();
return $freshSelf->www_view;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -1943,7 +1948,8 @@ sub www_moveTabRight {
my $tabId = $self->session->form->process('tabId'); my $tabId = $self->session->form->process('tabId');
$newSelf->moveTabRight($tabId); $newSelf->moveTabRight($tabId);
WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session); WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
return $newSelf->www_view; my $freshSelf = $newSelf->cloneFromDb();
return $freshSelf->www_view;
} }
@ -1996,7 +2002,8 @@ sub www_moveTabLeft {
my $tabId = $self->session->form->process('tabId'); my $tabId = $self->session->form->process('tabId');
$newSelf->moveTabLeft($tabId); $newSelf->moveTabLeft($tabId);
WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session); WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
return $newSelf->www_view; my $freshSelf = $newSelf->cloneFromDb();
return $freshSelf->www_view;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------