Context navigation

Changeset 13066

Timestamp:

16 Jun 2015, 14:48:55 (9 years ago)

Author:

Henrik Bettermann

Message:

Rename customer views which are not layout-aware and thus not pages.

Location:

main/waeup.ikoba/trunk

Files:

r12986	r13066
4	4	0.2dev (unreleased)
5	5	===================
	6
	7	* Rename customer views which are not layout-aware and thus not pages.
6	8
7	9	* Remove quite old bug in `doImport`: Replace empty strings and lists with

-                      r11949
+                      r13066
 import os
-#from waeup.ikoba.browser.layout import (
-#    IkobaPage, IkobaForm, IkobaLayout, IkobaDisplayFormPage, IkobaEditFormPage,
-#    IkobaAddFormPage, NullValidator)
-#from waeup.ikoba.browser.pages import ContactAdminForm
 IMAGE_PATH = os.path.join(

-                      r12804
+                      r13066
     grok.baseclass()
+class IkobaForm(UtilityView,Form):
+class IkobaPage(UtilityView,Page):
+    """A megrok.layout page with additional methods.
+    """
+    grok.baseclass()
+class IkobaFormPage(UtilityView,Form):
     """A megrok.layout.Form with additional methods.
     """
 …
     def setUpWidgets(self,ignore_request=False):
         super(IkobaForm,self).setUpWidgets(ignore_request)
+        super(IkobaFormPage,self).setUpWidgets(ignore_request)
         # Width parameters will be overridden by Bootstrap
         # so we have to set the css class
         if self.widgets.get('body'):
             self.widgets['body'].height = 10
-class IkobaPage(UtilityView,Page):
-    """A megrok.layout page with additional methods.
-    """
-    grok.baseclass()
 class IkobaDisplayFormPage(UtilityView,DisplayForm):

-                      r12995
+                      r13066
 from waeup.ikoba.utils.helpers import html2dict
 from waeup.ikoba.browser.layout import (
     IkobaPage, IkobaForm, IkobaEditFormPage, IkobaAddFormPage,
+    IkobaPage, IkobaFormPage, IkobaEditFormPage, IkobaAddFormPage,
     IkobaDisplayFormPage, NullValidator)
 from waeup.ikoba.browser.interfaces import (
 …
+#
 class ContactAdminForm(IkobaForm):
+class ContactAdminForm(IkobaFormPage):
     grok.name('contactadmin')
     #grok.context(ICompany)
 …
         return result
 class ChangePasswordRequestPage(IkobaForm):
+class ChangePasswordRequestPage(IkobaFormPage):
     """Captcha'd page for all kind of users to request a password change.
     """

-                      r12809
+                      r13066
 class CustomerActivatePage(UtilityView, grok.View):
+class CustomerActivateView(UtilityView, grok.View):
     """ Activate customer account
     """
 …
 class CustomerDeactivatePage(UtilityView, grok.View):
+class CustomerDeactivateView(UtilityView, grok.View):
     """ Deactivate customer account
     """
 …
         return
 class PDFDocumentsOverviewPage(UtilityView, grok.View):
+class PDFDocumentsOverviewSlip(UtilityView, grok.View):
     """Deliver an overview slip.
     """
 …
 class PDFDocumentSlipPage(UtilityView, grok.View):
+class PDFDocumentSlip(UtilityView, grok.View):
     """Deliver pdf file including metadata.
     """
 …
 class PDFMergeDocumentSlipPage(PDFDocumentSlipPage):
+class PDFMergeDocumentSlip(PDFDocumentSlip):
     """Deliver pdf file including metadata.
     """
 …
         return
 class PDFContractsOverviewPage(UtilityView, grok.View):
+class PDFContractsOverviewSlip(UtilityView, grok.View):
     """Deliver an overview slip.
     """
 …
 class PDFContractSlipPage(UtilityView, grok.View):
+class PDFContractSlip(UtilityView, grok.View):
     """Deliver pdf file including metadata.
     """
 …
 class PDFContractReceiptPage(UtilityView, grok.View):
+class PDFContractReceiptSlip(UtilityView, grok.View):
     """Deliver pdf file including metadata.
     """

-                      r12446
+                      r13066
     CustomerFilesUploadPage,
     DocumentDisplayFormPage, DocumentManageFormPage, DocumentEditFormPage,
     PDFDocumentSlipPage,)
+    PDFDocumentSlip,)
 grok.templatedir('browser_templates')
 …
 class SampleScanPDFSlip(SampleScanDisplay):
     grok.view(PDFDocumentSlipPage)
+    grok.view(PDFDocumentSlip)
 …
 class PDFScanSlip(PDFScanDisplay):
     grok.view(PDFDocumentSlipPage)
+    grok.view(PDFDocumentSlip)

-                      r12825
+                      r13066
         logcontent = open(logfile).read()
         self.assertTrue(
             'zope.mgr - customers.browser.CustomerDeactivatePage - '
+            'zope.mgr - customers.browser.CustomerDeactivateView - '
             'K1000000 - account deactivated' in logcontent)
         self.assertTrue(
             'zope.mgr - customers.browser.CustomerActivatePage - '
+            'zope.mgr - customers.browser.CustomerActivateView - '
             'K1000000 - account activated' in logcontent)

r12457	r13066
39	39	from waeup.ikoba.browser.layout import (
40	40	IkobaPage, IkobaEditFormPage, IkobaAddFormPage, IkobaDisplayFormPage,
41		~~IkobaForm,~~ NullValidator, jsaction, action, UtilityView)
	41	NullValidator, jsaction, action, UtilityView)
42	42	from waeup.ikoba.widgets.datewidget import (
43	43	FriendlyDateWidget, FriendlyDateDisplayWidget,

r12782	r13066
36	36	from waeup.ikoba.browser.layout import (
37	37	IkobaPage, IkobaEditFormPage, IkobaAddFormPage, IkobaDisplayFormPage,
38		~~IkobaForm,~~ NullValidator, jsaction, action, UtilityView)
	38	NullValidator, jsaction, action, UtilityView)
39	39	from waeup.ikoba.widgets.datewidget import (
40	40	FriendlyDateWidget, FriendlyDateDisplayWidget,

Note: See TracChangeset for help on using the changeset viewer.