Changeset 12365

Timestamp:

2 Jan 2015, 10:09:50 (10 years ago)

Author:

Henrik Bettermann

Message:

Revert changes from rr12360.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Files:

• browser.py (modified) (1 diff)
• export.py (modified) (1 diff)
• tests/test_export.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/browser.py

@@ -175 +175 @@
     def form_fields(self):
         return grok.AutoFields(self.context.form_fields_interface).omit(
-            'html_multilingual')
+            'html_dict', 'html_multilingual')
 
     @property

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/export.py

@@ -44 +44 @@
                   'formatted_transition_date',
                   'translated_class_name',
-                  'html_dict',
                   'connected_files',   # Could be used to export file URLs
                   ]

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_export.py

@@ -114 +114 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'class_name,description,document_id,history,'
+            'class_name,description,document_id,history,html_dict,'
             'html_multilingual,state,title,users_with_local_roles\r\n'
             'HTMLDocument,,DOC2,'
             '[u\'2014-12-21 16:50:28 UTC - Document created by system\'],'
-            ',created,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"',
+            '{},,created,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"',
             result
             )
@@ -129 +129 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'class_name,description,document_id,history,'
+            'class_name,description,document_id,history,html_dict,'
             'html_multilingual,state,title,users_with_local_roles\r\n'
             'HTMLDocument,,DOC2,'
             '[u\'2014-12-21 16:50:28 UTC - Document created by system\'],'
-            ',created,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"',
+            '{},,created,,"[{\'user_name\': u\'john\', \'local_role\': u\'johnsrole\'}]"',
             result
             )