Changeset 9011 for main

Timestamp:

18 Jul 2012, 06:01:56 (12 years ago)

Author:

Henrik Bettermann

Message:

Let's provide some UI components for helpers and utilities.

Move msave from helpers.py to pages.py.

Location:

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

Files:

• browser/pages.py (modified) (3 diffs)
• students/tests/test_browser.py (modified) (1 diff)
• utils/browser.py (added)
• utils/helpers.py (modified) (1 diff)
• utils/tests/test_browser.py (added)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -67 +67 @@
 from waeup.kofa.widgets.htmlwidget import HTMLDisplayWidget
 from waeup.kofa.authentication import get_principal_role_manager
-from waeup.kofa.utils.helpers import get_user_account, msave
+from waeup.kofa.utils.helpers import get_user_account
 from waeup.kofa.mandates.mandate import PasswordMandate
 
@@ -157 +157 @@
     return
 
+# Save function used for save methods in pages
+def msave(view, **data):
+    changed_fields = view.applyData(view.context, **data)
+    # Turn list of lists into single list
+    if changed_fields:
+        changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
+    fields_string = ' + '.join(changed_fields)
+    view.flash(_('Form has been saved.'))
+    ob_class = view.__implemented__.__name__.replace('waeup.kofa.','')
+    if fields_string:
+        grok.getSite().logger.info('%s - saved: %s' % (ob_class, fields_string))
+    return
+
 #
 # Login/logout and language switch pages...
@@ -373 +386 @@
     def entries(self):
         return ()
-
-class ReindexPage(UtilityView, grok.View):
-    """ Reindex view.
-
-    Reindexes a catalog. For managers only.
-    """
-    grok.context(IUniversity)
-    grok.name('reindex')
-    grok.require('waeup.managePortal')
-
-    def update(self,ctlg=None):
-        if ctlg is None:
-            self.flash('No catalog name provided.')
-            return
-        cat = queryUtility(ICatalog, name='%s_catalog' % ctlg)
-        if cat is None:
-            self.flash('%s_catalog does not exist' % ctlg)
-            return
-        self.context.logger.info(
-            'Catalog `%s_catalog` re-indexing started.' % ctlg)
-        cat.updateIndexes()
-        no_of_entries = cat.values()[0].documentCount()
-        self.flash('%d %s re-indexed.' % (no_of_entries,ctlg))
-        self.context.logger.info(
-            'Re-indexing of %d objects finished.' % no_of_entries)
-        return
-
-    def render(self):
-        self.redirect(self.url(self.context, '@@index'))
-        return
 
 #

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

@@ -1868 +1868 @@
         self.assertTrue('An email with' in self.browser.contents)
 
-    def test_reindex(self):
-        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open('http://localhost/app/reindex')
-        self.assertTrue('No catalog name provided' in self.browser.contents)
-        self.browser.open('http://localhost/app/reindex?ctlg=xyz')
-        self.assertTrue('xyz_catalog does not exist' in self.browser.contents)
-        cat = queryUtility(ICatalog, name='students_catalog')
-        results = cat.searchResults(student_id=(None, None))
-        self.assertEqual(len(results),1)
-        cat.clear()
-        results = cat.searchResults(student_id=(None, None))
-        self.assertEqual(len(results),0)
-        self.browser.open('http://localhost/app/reindex?ctlg=students')
-        self.assertTrue('1 students re-indexed' in self.browser.contents)
-        results = cat.searchResults(student_id=(None, None))
-        self.assertEqual(len(results),1)
-
     def test_change_current_mode(self):
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')

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

@@ -683 +683 @@
         writer.writerow(row)
     return tmp_path
-
-# Save function used for save methods in pages
-def msave(view, **data):
-    changed_fields = view.applyData(view.context, **data)
-    # Turn list of lists into single list
-    if changed_fields:
-        changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
-    fields_string = ' + '.join(changed_fields)
-    view.flash(_('Form has been saved.'))
-    ob_class = view.__implemented__.__name__.replace('waeup.kofa.','')
-    if fields_string:
-        grok.getSite().logger.info('%s - saved: %s' % (ob_class, fields_string))
-    return