From 78dbd7f5fddb5fad1040e89b33d0b627a6776515 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Thu, 6 Nov 2008 23:39:26 +0000
Subject: [PATCH] fixed #9047: Unable to reorder DataForm tabs

---
 docs/changelog/7.x.x.txt             |  1 +
 lib/WebGUI/Asset/Wobject/DataForm.pm | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1525278a9..fbdeba296 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,7 @@
  - Brand new Survey system.  Make sure to export your old results as they will
    not be imported, only the surveys themselves.
  - fixed #9028: Thingy fails when setting values containing single quotes
+ - fixed #9047: Unable to reorder DataForm tabs
 
 7.6.2
  - fixed: not allowed to add calendar events if in can edit group but not can add event group
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index e5c780448..54c5e908c 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -1383,7 +1383,7 @@ sub www_moveFieldDown {
         unless $self->canEdit;
     my $newSelf = $self->addRevision;
     my $fieldName = $self->session->form->process('fieldName');
-    $self->moveFieldDown($fieldName);
+    $newSelf->moveFieldDown($fieldName);
     WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
     return $newSelf->www_view;
 }
@@ -1417,7 +1417,7 @@ sub www_moveFieldUp {
         unless $self->canEdit;
     my $newSelf = $self->addRevision;
     my $fieldName = $self->session->form->process('fieldName');
-    $self->moveFieldUp($fieldName);
+    $newSelf->moveFieldUp($fieldName);
     WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
     return $newSelf->www_view;
 }
@@ -1452,7 +1452,7 @@ sub www_moveTabRight {
         unless $self->canEdit;
     my $newSelf = $self->addRevision;
     my $tabId = $self->session->form->process('tabId');
-    $self->moveTabRight($tabId);
+    $newSelf->moveTabRight($tabId);
     WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
     return $newSelf->www_view;
 }
@@ -1470,7 +1470,7 @@ sub moveTabRight {
     my $newPos = $currentPos + 1;
     if ($newPos < @$tabOrder) {
         splice @$tabOrder, $newPos, 0, splice(@$tabOrder, $currentPos, 1);
-        $self->_saveFieldConfig;
+        $self->_saveTabConfig;
     }
     return 1;
 }
@@ -1482,7 +1482,7 @@ sub www_moveTabLeft {
         unless $self->canEdit;
     my $newSelf = $self->addRevision;
     my $tabId = $self->session->form->process('tabId');
-    $self->moveTabLeft($tabId);
+    $newSelf->moveTabLeft($tabId);
     WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
     return $newSelf->www_view;
 }
@@ -1500,7 +1500,8 @@ sub moveTabLeft {
     my $newPos = $currentPos - 1;
     if ($newPos >= 0) {
         splice @$tabOrder, $newPos, 0, splice(@$tabOrder, $currentPos, 1);
-        $self->_saveFieldConfig;
+
+        $self->_saveTabConfig;
     }
     return 1;
 }