Changeset 9262

Timestamp:

1 Oct 2012, 06:36:33 (12 years ago)

Author:

Henrik Bettermann

Message:

We need to export the batch id. This is necessary for reimport batches.

Location:

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

Files:

• accesscodes/export.py (modified) (1 diff)
• accesscodes/tests/test_export.py (modified) (1 diff)
• permissions.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/export.py

@@ -33 +33 @@
 
     #: Fieldnames considered by this exporter
-    fields = tuple(sorted(iface_names(IAccessCodeBatch)))
+    fields = tuple(sorted(iface_names(IAccessCodeBatch))) + ('batch_id',)
 
     #: The title under which this exporter will be displayed
     title = _(u'AccessCodeBatches')
+
+    def mangle_value(self, value, name, context=None):
+        if name == 'batch_id' and context is not None:
+            value = u'%s-%s' % (getattr(context, 'prefix', None),
+                getattr(context, 'num', None))
+        return super(
+            AccessCodeBatchExporter, self).mangle_value(
+            value, name, context=context)
 
     def export_all(self, site, filepath=None):

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

@@ -70 +70 @@
             result,
              'cost,creation_date,creator,disabled_num,entry_num,num,'
-             'prefix,used_num\r\n6.6,now,manfred,0,0,1,APP,0\r\n6.6,'
-             'now,manfred,0,0,0,SFE,0\r\n'
+             'prefix,used_num,batch_id\r\n6.6,now,manfred,0,0,1,APP,0,APP-1\r\n'
+             '6.6,now,manfred,0,0,0,SFE,0,SFE-0\r\n'
             )
         return

main/waeup.kofa/trunk/src/waeup/kofa/permissions.py

@@ -222 +222 @@
 
 class CCOfficer(grok.Role):
-    """The Computer Center Officer gets the same permissions as the
-    Portal Manager except the most dangerous ones.
+    """This is basically a copy of the the PortalManager. We exclude some
+    'dangerous' permissions by commenting them out.
     """
     grok.name('waeup.CCOfficer')