Changeset 12393 for main/waeup.kofa/trunk/src/waeup

Timestamp:

4 Jan 2015, 16:00:38 (10 years ago)

Author:

Henrik Bettermann

Message:

Fix some tests and other minor changes to adjust to Ikoba.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/templates/default_waeup_edit_form.pt (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_export.py (modified) (1 diff)
• students/viewlets.py (modified) (1 diff)
• utils/helpers.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/default_waeup_edit_form.pt

@@ -8 +8 @@
     </tbody>
   </table>
+  <br />
   <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -670 +670 @@
         self.browser.getControl(
             name='upload_passportuploadmanage').click()
-        self.assertTrue('jpg file extension expected'
+        self.assertTrue('jpg file format expected'
             in self.browser.contents)
         ctrl = self.browser.getControl(name='passportuploadmanage')

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -1046 +1046 @@
             'current_level,current_session,current_mode,'
             '%s\r\nA111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
-            '200,2012,ug_ft,,,,,14.14,,,12.12,,\r\n'
+            '200,2012,ug_ft,,,,,14.14,,12.12,,,\r\n'
             % year_range_str in result
             )

main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py

@@ -843 +843 @@
     if expected_ext:
         if '.' + file_format != expected_ext:
-            view.flash(_('${a} file extension expected.',
+            view.flash(_('${a} file format expected.',
                 mapping = {'a':expected_ext[1:]}), type="danger")
             return False

main/waeup.kofa/trunk/src/waeup/kofa/utils/helpers.py

@@ -823 +823 @@
     for part in parts:
         if part[2:4] == u'<<':
-            lang = part[0:2].lower()
+            lang = str(part[0:2].lower())
             text = part[4:]
             elements[lang] = renderElement(u'div id="html"',