Merge pull request smcmahon#192 from mikerenfro/fix-column-titles

Adding getColumnNames logic to getColumnTitles
abstract-open-solutions · Mar 7, 2017 · eb3d189 · eb3d189
2 parents faa4352 + 82c18e9
commit eb3d189
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -15,6 +15,9 @@ Change History
   of a tag not being closed
   [datakurre]
 
+- Fix issue where logic in FormSaveDataAdapter's getColumnTitles was
+  different than the logic for getColumnNames.
+  [mikerenfro]
 
 1.8.3 (2016-12-06)
 ------------------

diff --git a/Products/PloneFormGen/content/saveDataAdapter.py b/Products/PloneFormGen/content/saveDataAdapter.py
@@ -381,8 +381,10 @@ def getColumnNames(self, excludeServerSide=True):
     def getColumnTitles(self, excludeServerSide=True):
         # """Returns a list of column titles"""
 
+        showFields = getattr(self, 'showFields', [])
         names = [field.widget.label for field
-                 in self.fgFields(displayOnly=True, excludeServerSide=excludeServerSide)]
+                 in self.fgFields(displayOnly=True, excludeServerSide=excludeServerSide)
+                 if not showFields or field.getName() in showFields]
         for f in self.ExtraData:
             names.append(self.vocabExtraDataDL().getValue(f, ''))