Mailing List Archive

Log message for revision 41517:
Converted the layer field to accept multiple values and renamed to 'layers'.


Changed:
_U zope.webdev/trunk/
U zope.webdev/trunk/browser/page.py
U zope.webdev/trunk/interfaces.py
U zope.webdev/trunk/page.py

-=-

Property changes on: zope.webdev/trunk
___________________________________________________________________
Name: svk:merge
- 98c0701e-2f07-0410-a1a0-c1bc72243522:/local/zope.webdev/trunk:7361
+ 98c0701e-2f07-0410-a1a0-c1bc72243522:/local/zope.webdev/trunk:7362

Modified: zope.webdev/trunk/browser/page.py
===================================================================
--- zope.webdev/trunk/browser/page.py 2006-01-31 18:00:29 UTC (rev 41516)
+++ zope.webdev/trunk/browser/page.py 2006-01-31 18:00:39 UTC (rev 41517)
@@ -31,8 +31,6 @@
from zope.security.proxy import removeSecurityProxy
from zope.app.pagetemplate import ViewPageTemplateFile
from zope.interface.common import idatetime
-from zope.app.form import CustomWidgetFactory
-from zope.app.form.browser import MultiCheckBoxWidget


class AddForm(base.UtilityAddFormBase):
@@ -81,7 +79,6 @@
class Overview(base.EditFormBase):
"""Page Overview."""
form_fields = form.Fields(interfaces.IPage).select(
- 'name', 'for_', 'layer', 'permission','templateSource',
+ 'name', 'for_', 'layers', 'permission','templateSource',
'moduleSource','className')
- form_edit_widgets = {'layer': CustomWidgetFactory(MultiCheckBoxWidget)}
template = ViewPageTemplateFile('package_overview.pt')

Modified: zope.webdev/trunk/interfaces.py
===================================================================
--- zope.webdev/trunk/interfaces.py 2006-01-31 18:00:29 UTC (rev 41516)
+++ zope.webdev/trunk/interfaces.py 2006-01-31 18:00:39 UTC (rev 41517)
@@ -149,12 +149,15 @@
vocabulary="Interfaces",
required=True)

- layer = zope.schema.Choice(
- title=_('Layer'),
- description=_("The layer in which the page will be available."),
- vocabulary="Layers",
+ layers = zope.schema.List(
+ title=_('Layers'),
+ description=_("The layers in which the page will be available."),
required=True,
- default=IDefaultBrowserLayer)
+ default=[IDefaultBrowserLayer],
+ value_type=zope.schema.Choice(
+ vocabulary="Layers",
+ )
+ )

permission = zope.schema.Choice(
title=_(u"Permission"),

Modified: zope.webdev/trunk/page.py
===================================================================
--- zope.webdev/trunk/page.py 2006-01-31 18:00:29 UTC (rev 41516)
+++ zope.webdev/trunk/page.py 2006-01-31 18:00:39 UTC (rev 41517)
@@ -38,7 +38,7 @@

def __init__(self, name,
for_=zope.interface.Interface,
- layer=IDefaultBrowserLayer,
+ layers=(IDefaultBrowserLayer,),
permission=zope.security.checker.CheckerPublic,
templateSource=None, moduleSource=None, className=None):

@@ -47,7 +47,7 @@

self.name = name
self.for_ = for_
- self.layer = layer
+ self.layers = layers
self.permission = permission
if templateSource is not None:
self.templateSource = templateSource
@@ -100,7 +100,7 @@

@property
def with(self):
- return (self.page.layer, )
+ return self.page.layers

@property
def required(self):

_______________________________________________
Zope-CVS maillist - Zope-CVS@zope.org
http://mail.zope.org/mailman/listinfo/zope-cvs

Zope CVS instructions: http://dev.zope.org/CVS