Changeset 8891

Timestamp:

3 Jul 2012, 17:20:29 (12 years ago)

Author:

uli

Message:

Merge changes from uli-autoinclude-less branch back into trunk.

Location:

main/kofacustom.nigeria/trunk

Files:

• . (modified) (1 prop)
• buildout.cfg (modified) (1 diff)
• src/kofacustom/nigeria/configure.zcml (modified) (1 diff)
• src/kofacustom/nigeria/overrides.zcml (deleted)
• src/kofacustom/nigeria/students/browser.py (modified) (5 diffs)

main/kofacustom.nigeria/trunk/buildout.cfg

@@ -4 +4 @@
 # Install waeup.kofa as develop egg
 auto-checkout = waeup.kofa
+sources-dir = sources
 develop = .
 parts =

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/configure.zcml

@@ -1 +1 @@
 <configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:grok="http://namespaces.zope.org/grok"
-           xmlns:i18n="http://namespaces.zope.org/i18n">
+           xmlns:grok="http://namespaces.zope.org/grok">
 
-  <!-- Loading grok also configures a lot of other needed packages correctly.
+  <!-- Loading waeup.kofa also configures a lot of other needed
+       packages correctly.
   -->
+  <include package="waeup.kofa" />
   <include package="kofacustom.nigeria" file="locales.zcml" />
-  <include package="grok" />
-  <includeOverrides package="kofacustom.nigeria" file="overrides.zcml" />
+  <grok:grok package="." />
+
+  <!-- Register edit widget for PhoneNumbers -->
+  <adapter
+      for="waeup.kofa.schema.interfaces.IPhoneNumber
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.formlib.interfaces.ISimpleInputWidget"
+      factory="kofacustom.nigeria.widgets.phonewidget.NigeriaPhoneWidget"
+      permission="zope.Public"
+      />
+
 </configure>

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py

@@ -66 +66 @@
     """ Page to display student personal data
     """
-    grok.context(INigeriaStudent)
     form_fields = grok.AutoFields(INigeriaStudentPersonal)
     form_fields['perm_address'].custom_widget = BytesDisplayWidget
@@ -80 +79 @@
     """ Page to display student clearance data
     """
-    grok.context(INigeriaStudent)
 
     @property
@@ -96 +94 @@
     """Deliver a PDF slip of the context.
     """
-    grok.context(INigeriaStudent)
 
     @property
@@ -112 +109 @@
     """ Page to edit student clearance data
     """
-    grok.context(INigeriaStudent)
 
     @property
@@ -126 +122 @@
     """ View to edit student clearance data by student
     """
-    grok.context(INigeriaStudent)
 
     @property