Changeset 9209 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/utils

Timestamp:

20 Sep 2012, 08:49:37 (12 years ago)

Author:

uli

Message:

Merge changes from update branch (includes trunk changes until r9107).

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/utils/batching.py (modified) (4 diffs)
• src/waeup/kofa/utils/browser.py (copied) (copied from main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/utils/browser.py)
• src/waeup/kofa/utils/helpers.py (modified) (2 diffs)
• src/waeup/kofa/utils/tests/test_browser.py (copied) (copied from main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/utils/tests/test_browser.py)
• src/waeup/kofa/utils/utils.py (modified) (4 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/utils/batching.py

@@ -304 +304 @@
         finished_writer = csv.DictWriter(open(finished_path, 'wb'),
                                          finished_headers)
+        os.chmod(finished_path, 0664)
         finished_writer.writerow(dict([(x,x) for x in finished_headers]))
 
@@ -398 +399 @@
                 os.path.abspath(finished_path), failed_path)
 
+    def get_csv_skeleton(self):
+        """Export CSV file only with a header of available fields.
+
+        A raw string with CSV data should be returned.
+        """
+        outfile = StringIO()
+        writer = csv.DictWriter(outfile, self.available_fields)
+        writer.writerow(dict(zip(self.available_fields, self.available_fields))) # header
+        outfile.seek(0)
+        return outfile.read()
+
 class ExporterBase(object):
     """A base for exporters.
@@ -506 +518 @@
 
     The resulting CSV file will be stored in a new temporary directory
-    (using :func:`tempfile.mkdtemp`).
+    (using :func:`tempfile.mkdtemp`). It will be named after the
+    exporter used with `.csv` filename extension.
 
     Returns the path to the created CSV file.
@@ -516 +529 @@
     exporter = getUtility(ICSVExporter, name=exporter_name)
     output_dir = tempfile.mkdtemp()
-    output_path = os.path.join(output_dir, 'export.csv')
+    filename = '%s.csv' % exporter_name
+    output_path = os.path.join(output_dir, filename)
     exporter.export_all(site, filepath=output_path)
     return output_path

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/utils/helpers.py

@@ -520 +520 @@
             if exclude_methods and isinstance(descr, Method):
                 continue
+            if name in result:
+                continue
             result.append(name)
     return result
@@ -683 +685 @@
         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

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/utils/utils.py

@@ -123 +123 @@
 
     STUDY_MODES_DICT = {
+        'transfer': 'Transfer',
         'ug_ft': 'Undergraduate Full-Time',
         'ug_pt': 'Undergraduate Part-Time',
@@ -192 +193 @@
 
 
-    def sendCredentials(self, user, password=None, login_url=None, msg=None):
+    def sendCredentials(self, user, password=None, url_info=None, msg=None):
         """Send credentials as email.
 
@@ -209 +210 @@
 Your user name: ${d}
 Your password: ${e}
-Login page: ${f}
+${f}
 
 Please remember your user name and keep
@@ -230 +231 @@
             'd':user.name,
             'e':password,
-            'f':login_url})
+            'f':url_info})
 
         body = translate(text, 'waeup.kofa',