From 2808a19670f31370818c584f58ccddb266221ead Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Mon, 10 Jan 2011 19:25:37 -0600
Subject: [PATCH] fix 11988 dataform list view missing field control

---
 docs/changelog/7.x.x.txt                      |   1 +
 docs/upgrades/packages-7.10.7/data_list.wgpkg | Bin 0 -> 2062 bytes
 lib/WebGUI/Asset/Wobject/DataForm.pm          |   1 +
 lib/WebGUI/i18n/English/Asset_DataForm.pm     |   6 ++++++
 4 files changed, 8 insertions(+)
 create mode 100644 docs/upgrades/packages-7.10.7/data_list.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 3f083c6f5..c7be0469d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -30,6 +30,7 @@
  - fixed #12004: SSO operation vulnerable to session fixation attacks
  - fixed #11996: Mandatory field in Thingy saves empty
  - fixed #11987: Map displays white text on white background
+ - fixed #11988: Dataform list view doesn't allow moving fields
 
 7.10.6
  - fixed #11974: Toolbar icons unclickable in Webkit using HTML5
diff --git a/docs/upgrades/packages-7.10.7/data_list.wgpkg b/docs/upgrades/packages-7.10.7/data_list.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..c13b733db08492d59e60c5be15732b46728bef12
GIT binary patch
literal 2062
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

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 78a14f164..432ef021a 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -787,6 +787,7 @@ sub getListTemplateVars {
             'field.label'       => $fieldConfig->{$_}{label},
             'field.isMailField' => $fieldConfig->{$_}{isMailField},
             'field.type'        => $fieldConfig->{$_}{type},
+            "field.controls"          => $self->_fieldAdminIcons($fieldConfig->{$_}{name}),
         }
     } @{ $self->getFieldOrder };
     $var->{field_loop} = \@fieldLoop;
diff --git a/lib/WebGUI/i18n/English/Asset_DataForm.pm b/lib/WebGUI/i18n/English/Asset_DataForm.pm
index 6821246d0..e1effcb48 100644
--- a/lib/WebGUI/i18n/English/Asset_DataForm.pm
+++ b/lib/WebGUI/i18n/English/Asset_DataForm.pm
@@ -1050,6 +1050,12 @@ be useful, others may not.|,
         context     => q{Help for template variable},
     },
 
+    'add entry' => {
+        message     => q{Add Entry},
+        lastUpdated => 0,
+        context     => q{Label for link to add a new entry to the dataform},
+    },
+
 };
 
 1;