Changeset 9217 for main/waeup.kofa/trunk/src/waeup/kofa/applicants

Timestamp:

21 Sep 2012, 11:21:05 (12 years ago)

Author:

uli

Message:

Merge changes from uli-async-update back into trunk.

Location:

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

Files:

• applicant.py (modified) (2 diffs)
• browser.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)

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

@@ -29 +29 @@
 from zope.schema.interfaces import RequiredMissing, ConstraintNotSatisfied
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
-from waeup.kofa.app import University
 from waeup.kofa.image import KofaImageFile
 from waeup.kofa.imagestorage import DefaultFileStoreHandler
 from waeup.kofa.interfaces import (
     IObjectHistory, IFileStoreHandler, IFileStoreNameChooser, IKofaUtils,
-    IExtFileStore, IPDF, IUserAccount)
+    IExtFileStore, IPDF, IUserAccount, IUniversity)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.vocabularies import RegNumNotInSource
@@ -189 +188 @@
     """A catalog indexing :class:`Applicant` instances in the ZODB.
     """
-    grok.site(University)
+    grok.site(IUniversity)
     grok.name('applicants_catalog')
     grok.context(IApplicant)

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

@@ -38 +38 @@
     INITIALIZED, STARTED, PAID, SUBMITTED, ADMITTED)
 from waeup.kofa.browser import (
-    KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
+#    KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
     DEFAULT_PASSPORT_IMAGE_PATH)
+from waeup.kofa.browser.layout import (
+    KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage)
 from waeup.kofa.browser.interfaces import ICaptchaManager
 from waeup.kofa.browser.breadcrumbs import Breadcrumb

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

@@ -27 +27 @@
 from zope.schema.interfaces import (
     ValidationError, ISource, IContextSourceBinder)
+from waeup.kofa.browser.interfaces import IApplicantBase
 from waeup.kofa.schema import TextLineChoice, FormattedDate
 from waeup.kofa.interfaces import (
@@ -311 +312 @@
     'year'].order =  IApplicantsContainer['year'].order
 
-class IApplicantBaseData(IKofaObject):
+class IApplicantBaseData(IApplicantBase):
     """The data for an applicant.