Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/university/export.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

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

Files:

• . (modified) (1 prop)
• src/waeup/kofa/university/export.py (modified) (11 diffs)

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

@@ -19 +19 @@
 """
 import grok
-from zope.securitypolicy.interfaces import IPrincipalRoleMap
 from waeup.kofa.interfaces import ICSVExporter
 from waeup.kofa.interfaces import MessageFactory as _
@@ -31 +30 @@
 
     #: Fieldnames considered by this exporter
-    fields = ('code', 'title', 'title_prefix', 'users_with_local_roles')
+    fields = ('code', 'title', 'title_prefix')
 
     #: The title under which this exporter will be displayed
     title = _(u'Faculties')
-
-    def mangle_value(self, value, name, context=None):
-        """Hook for mangling values in derived classes
-        """
-        if name == 'users_with_local_roles':
-            value = []
-            role_map = IPrincipalRoleMap(context)
-            for local_role, user_name, setting in role_map.getPrincipalsAndRoles():
-                value.append({'user_name':user_name,'local_role':local_role})
-        return super(FacultyExporter, self).mangle_value(
-            value, name, context)
 
     def export(self, faculties, filepath=None):
@@ -62 +50 @@
         If `filepath` is ``None``, a raw string with CSV data is returned.
         """
+        writer, outfile = self.get_csv_writer(filepath)
         faculties = site.get('faculties', {})
         return self.export(faculties.values(), filepath)
@@ -72 +61 @@
 
     #: Fieldnames considered by this exporter
-    fields = ('code', 'faculty_code', 'title', 'title_prefix',
-        'users_with_local_roles')
+    fields = ('code', 'faculty_code', 'title', 'title_prefix')
 
     #: The title under which this exporter will be displayed
@@ -89 +77 @@
 
     def export_all(self, site, filepath=None):
-        """Export departments in faculty into filepath as CSV data.
+        """Export faculties in facultycontainer into filepath as CSV data.
 
         If `filepath` is ``None``, a raw string with CSV data is returned.
@@ -109 +97 @@
     #: Fieldnames considered by this exporter
     fields = ('code', 'faculty_code', 'department_code', 'title', 'credits',
-              'passmark', 'semester', 'users_with_local_roles')
+              'passmark', 'semester')
 
     #: The title under which this exporter will be displayed
@@ -117 +105 @@
         """Hook for mangling values in derived classes
         """
-        if name == 'users_with_local_roles':
-            value = []
-            role_map = IPrincipalRoleMap(context)
-            for local_role, user_name, setting in role_map.getPrincipalsAndRoles():
-                value.append({'user_name':user_name,'local_role':local_role})
-        elif name == 'faculty_code':
+        if name == 'faculty_code':
             try:
                 value = context.__parent__.__parent__.__parent__.code
@@ -136 +119 @@
 
     def export_all(self, site, filepath=None):
-        """Export courses into filepath as CSV data.
+        """Export faculties in facultycontainer into filepath as CSV data.
 
         If `filepath` is ``None``, a raw string with CSV data is returned.
@@ -157 +140 @@
     fields = ('code', 'faculty_code', 'department_code', 'title', 'study_mode',
               'start_level', 'end_level', 'application_category',
-              'school_fee_1', 'school_fee_2', 'school_fee_3', 'school_fee_4',
-              'users_with_local_roles')
+              'school_fee_1', 'school_fee_2')
 
     #: The title under which this exporter will be displayed
@@ -164 +146 @@
 
     def export_all(self, site, filepath=None):
-        """Export certificates into filepath as CSV data.
+        """Export faculties in facultycontainer into filepath as CSV data.
 
         If `filepath` is ``None``, a raw string with CSV data is returned.
@@ -211 +193 @@
 
     def export_all(self, site, filepath=None):
-        """Export certificate courses into filepath as CSV data.
+        """Export faculties in facultycontainer into filepath as CSV data.
 
         If `filepath` is ``None``, a raw string with CSV data is returned.