Changeset 7903

Timestamp:

17 Mar 2012, 23:54:05 (13 years ago)

Author:

uli

Message:

Make description_dict a simple attribute.

Location:

main/waeup.kofa/trunk

Files:

• buildout.cfg (modified) (1 diff)
• etc/site.zcml.in (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/waeup/kofa/applicants/browser.py (modified) (4 diffs)
• src/waeup/kofa/applicants/container.py (modified) (1 diff)
• src/waeup/kofa/applicants/export.py (modified) (1 diff)
• src/waeup/kofa/applicants/interfaces.py (modified) (1 diff)
• src/waeup/kofa/applicants/tests/test_export.py (modified) (1 diff)

main/waeup.kofa/trunk/buildout.cfg

@@ -77 +77 @@
 recipe = zc.recipe.egg
 eggs = waeup.kofa [beaker]
+       grokcore.startup
+       zope.app.appsetup
 arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
 scripts = kofactl=kofactl

main/waeup.kofa/trunk/etc/site.zcml.in

@@ -3 +3 @@
            i18n_domain="waeup.kofa">
 
-  <include package="waeup.kofa" />
+  <include package="waeup.kofa" file="configure.zcml" />
   <include package="waeup.kofa" file="mail.zcml" />
 

main/waeup.kofa/trunk/setup.py

@@ -24 +24 @@
     'reportlab',
     'PIL',
+    'zope.app.appsetup',
     'zope.app.authentication', # BBB: During switch to grok 1.1
     'zope.app.file',
     'zope.app.testing',        # XXX: test_permissions needs this
     'zope.app.undo',
+    'zope.app.wsgi',
     'zope.file',
     'zope.interface >= 3.6.0',

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

@@ -24 +24 @@
 from datetime import datetime, date
 from zope.component import getUtility, createObject, getAdapter
-from zope.formlib.form import setUpEditWidgets
 from zope.i18n import translate
 from hurry.workflow.interfaces import (
@@ -150 +149 @@
 
     form_fields = grok.AutoFields(
-        IApplicantsContainerAdd).omit('code').omit('title', 'description_dict')
+        IApplicantsContainerAdd).omit('code').omit('title')
     form_fields['startdate'].custom_widget = FriendlyDateWidget('le')
     form_fields['enddate'].custom_widget = FriendlyDateWidget('le')
@@ -224 +223 @@
     pnav = 3
 
-    form_fields = grok.AutoFields(IApplicantsContainer).omit(
-        'title', 'description_dict')
+    form_fields = grok.AutoFields(IApplicantsContainer).omit('title') 
     form_fields['startdate'].custom_widget = FriendlyDateDisplayWidget('le')
     form_fields['enddate'].custom_widget = FriendlyDateDisplayWidget('le')
@@ -251 +249 @@
     grok.name('manage')
     grok.template('applicantscontainermanagepage')
-    form_fields = grok.AutoFields(IApplicantsContainer).omit(
-        'title', 'description_dict')
+    form_fields = grok.AutoFields(IApplicantsContainer).omit('title')
     taboneactions = [_('Save'),_('Cancel')]
     tabtwoactions = [_('Add applicant'), _('Remove selected'),_('Cancel')]

main/waeup.kofa/trunk/src/waeup/kofa/applicants/container.py

@@ -59 +59 @@
     #: to create proper applicant objects.
     factory_name = 'waeup.Applicant'
+    #: A dictionary to hold per language translations of description string.
+    description_dict = {}
 
     @property

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

@@ -31 +31 @@
     fields = ('code', 'title', 'prefix', 'entry_level', 'year',
               'provider', 'application_category', 'description',
-              'description_dict', 'startdate', 'enddate', 'strict_deadline')
+              'startdate', 'enddate', 'strict_deadline')
 
     def export(self, containers, filepath=None):

main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py

@@ -265 +265 @@
         )
 
-    description_dict = schema.Dict(
-        title = u'Content as language dictionary with values in html format',
-        required = False,
-        default = {},
-        )
+    description_dict = Attribute(
+        """Content as language dictionary with values in HTML format.""")
 
     startdate = schema.Date(

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

@@ -48 +48 @@
             result,
             'code,title,prefix,entry_level,year,provider,application_category,'
-            'description,description_dict,startdate,enddate,strict_deadline\r\n'
-            'dp2012,-,,100,,,,"This text can been seen by anonymous users.\nHere we put mult-lingual information about the study courses provided, the application procedure and deadlines.\n>>de<<\nDieser Text kann von anonymen Benutzern gelesen werden.\nHier koennen mehrsprachige Informationen fuer Antragsteller hinterlegt werden.",{},2012-01-01,,1\r\n'
+            'description,startdate,enddate,strict_deadline\r\n'
+            'dp2012,-,,100,,,,"This text can been seen by anonymous users.\nHere we put mult-lingual information about the study courses provided, the application procedure and deadlines.\n>>de<<\nDieser Text kann von anonymen Benutzern gelesen werden.\nHier koennen mehrsprachige Informationen fuer Antragsteller hinterlegt werden.",2012-01-01,,1\r\n'
             )
         return