Ignore:
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/src/waeup/ikoba
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.ikoba/trunk/src/waeup/ikoba/browser/__init__.py

    r11949 r13066  
    11import os
    2 
    3 #from waeup.ikoba.browser.layout import (
    4 #    IkobaPage, IkobaForm, IkobaLayout, IkobaDisplayFormPage, IkobaEditFormPage,
    5 #    IkobaAddFormPage, NullValidator)
    6 #from waeup.ikoba.browser.pages import ContactAdminForm
    72
    83IMAGE_PATH = os.path.join(

  • main/waeup.ikoba/trunk/src/waeup/ikoba/browser/layout.py

    r12804 r13066  
    166166    grok.baseclass()
    167167
    168 class IkobaForm(UtilityView,Form):
     168class IkobaPage(UtilityView,Page):
     169    """A megrok.layout page with additional methods.
     170    """
     171    grok.baseclass()
     172
     173class IkobaFormPage(UtilityView,Form):
    169174    """A megrok.layout.Form with additional methods.
    170175    """
    … …  
    172177
    173178    def setUpWidgets(self,ignore_request=False):
    174         super(IkobaForm,self).setUpWidgets(ignore_request)
     179        super(IkobaFormPage,self).setUpWidgets(ignore_request)
    175180        # Width parameters will be overridden by Bootstrap
    176181        # so we have to set the css class
    177182        if self.widgets.get('body'):
    178183            self.widgets['body'].height = 10
    179 
    180 class IkobaPage(UtilityView,Page):
    181     """A megrok.layout page with additional methods.
    182     """
    183     grok.baseclass()
    184184
    185185class IkobaDisplayFormPage(UtilityView,DisplayForm):

  • main/waeup.ikoba/trunk/src/waeup/ikoba/browser/pages.py

    r12995 r13066  
    4444from waeup.ikoba.utils.helpers import html2dict
    4545from waeup.ikoba.browser.layout import (
    46     IkobaPage, IkobaForm, IkobaEditFormPage, IkobaAddFormPage,
     46    IkobaPage, IkobaFormPage, IkobaEditFormPage, IkobaAddFormPage,
    4747    IkobaDisplayFormPage, NullValidator)
    4848from waeup.ikoba.browser.interfaces import (
    … …  
    361361#
    362362
    363 class ContactAdminForm(IkobaForm):
     363class ContactAdminForm(IkobaFormPage):
    364364    grok.name('contactadmin')
    365365    #grok.context(ICompany)
    … …  
    15151515        return result
    15161516
    1517 class ChangePasswordRequestPage(IkobaForm):
     1517class ChangePasswordRequestPage(IkobaFormPage):
    15181518    """Captcha'd page for all kind of users to request a password change.
    15191519    """

  • main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

    r12809 r13066  
    454454
    455455
    456 class CustomerActivatePage(UtilityView, grok.View):
     456class CustomerActivateView(UtilityView, grok.View):
    457457    """ Activate customer account
    458458    """
    … …  
    474474
    475475
    476 class CustomerDeactivatePage(UtilityView, grok.View):
     476class CustomerDeactivateView(UtilityView, grok.View):
    477477    """ Deactivate customer account
    478478    """
    … …  
    10541054        return
    10551055
    1056 class PDFDocumentsOverviewPage(UtilityView, grok.View):
     1056class PDFDocumentsOverviewSlip(UtilityView, grok.View):
    10571057    """Deliver an overview slip.
    10581058    """
    … …  
    11111111
    11121112
    1113 class PDFDocumentSlipPage(UtilityView, grok.View):
     1113class PDFDocumentSlip(UtilityView, grok.View):
    11141114    """Deliver pdf file including metadata.
    11151115    """
    … …  
    11411141
    11421142
    1143 class PDFMergeDocumentSlipPage(PDFDocumentSlipPage):
     1143class PDFMergeDocumentSlip(PDFDocumentSlip):
    11441144    """Deliver pdf file including metadata.
    11451145    """
    … …  
    15831583        return
    15841584
    1585 class PDFContractsOverviewPage(UtilityView, grok.View):
     1585class PDFContractsOverviewSlip(UtilityView, grok.View):
    15861586    """Deliver an overview slip.
    15871587    """
    … …  
    16411641
    16421642
    1643 class PDFContractSlipPage(UtilityView, grok.View):
     1643class PDFContractSlip(UtilityView, grok.View):
    16441644    """Deliver pdf file including metadata.
    16451645    """
    … …  
    17261726
    17271727
    1728 class PDFContractReceiptPage(UtilityView, grok.View):
     1728class PDFContractReceiptSlip(UtilityView, grok.View):
    17291729    """Deliver pdf file including metadata.
    17301730    """

  • main/waeup.ikoba/trunk/src/waeup/ikoba/customers/fileviewlets.py

    r12446 r13066  
    3232    CustomerFilesUploadPage,
    3333    DocumentDisplayFormPage, DocumentManageFormPage, DocumentEditFormPage,
    34     PDFDocumentSlipPage,)
     34    PDFDocumentSlip,)
    3535
    3636grok.templatedir('browser_templates')
    … …  
    131131
    132132class SampleScanPDFSlip(SampleScanDisplay):
    133     grok.view(PDFDocumentSlipPage)
     133    grok.view(PDFDocumentSlip)
    134134
    135135
    … …  
    188188
    189189class PDFScanSlip(PDFScanDisplay):
    190     grok.view(PDFDocumentSlipPage)
     190    grok.view(PDFDocumentSlip)

  • main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

    r12825 r13066  
    550550        logcontent = open(logfile).read()
    551551        self.assertTrue(
    552             'zope.mgr - customers.browser.CustomerDeactivatePage - '
     552            'zope.mgr - customers.browser.CustomerDeactivateView - '
    553553            'K1000000 - account deactivated' in logcontent)
    554554        self.assertTrue(
    555             'zope.mgr - customers.browser.CustomerActivatePage - '
     555            'zope.mgr - customers.browser.CustomerActivateView - '
    556556            'K1000000 - account activated' in logcontent)
    557557

  • main/waeup.ikoba/trunk/src/waeup/ikoba/documents/browser.py

    r12457 r13066  
    3939from waeup.ikoba.browser.layout import (
    4040    IkobaPage, IkobaEditFormPage, IkobaAddFormPage, IkobaDisplayFormPage,
    41     IkobaForm, NullValidator, jsaction, action, UtilityView)
     41    NullValidator, jsaction, action, UtilityView)
    4242from waeup.ikoba.widgets.datewidget import (
    4343    FriendlyDateWidget, FriendlyDateDisplayWidget,

  • main/waeup.ikoba/trunk/src/waeup/ikoba/products/browser.py

    r12782 r13066  
    3636from waeup.ikoba.browser.layout import (
    3737    IkobaPage, IkobaEditFormPage, IkobaAddFormPage, IkobaDisplayFormPage,
    38     IkobaForm, NullValidator, jsaction, action, UtilityView)
     38    NullValidator, jsaction, action, UtilityView)
    3939from waeup.ikoba.widgets.datewidget import (
    4040    FriendlyDateWidget, FriendlyDateDisplayWidget,
Note: See TracChangeset for help on using the changeset viewer.