[Checkins] SVN: zope3org/trunk/src/zorg/multiform/ clean up code
and fix typos
Stefan Martin
s.martin at iwm-kmrc.de
Wed Apr 12 07:29:41 EDT 2006
Log message for revision 66881:
clean up code and fix typos
Changed:
U zope3org/trunk/src/zorg/multiform/configure.zcml
U zope3org/trunk/src/zorg/multiform/container/interfaces.py
U zope3org/trunk/src/zorg/multiform/container/location.py
U zope3org/trunk/src/zorg/multiform/container/views.py
U zope3org/trunk/src/zorg/multiform/gridform.py
U zope3org/trunk/src/zorg/multiform/gridform.txt
U zope3org/trunk/src/zorg/multiform/interfaces.py
U zope3org/trunk/src/zorg/multiform/multiform.py
-=-
Modified: zope3org/trunk/src/zorg/multiform/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/multiform/configure.zcml 2006-04-12 10:28:30 UTC (rev 66880)
+++ zope3org/trunk/src/zorg/multiform/configure.zcml 2006-04-12 11:29:40 UTC (rev 66881)
@@ -3,27 +3,27 @@
xmlns:i18n="http://namespaces.zope.org/i18n"
i18n_domain="zope">
- <adapter for="zope.app.location.interfaces.ILocation
- zope.formlib.interfaces.IForm"
- provides=".interfaces.IFormLocation"
- factory=".selection.FormLocationProxy"
- trusted="true"
- />
+ <adapter for="zope.app.location.interfaces.ILocation
+ zope.formlib.interfaces.IForm"
+ provides=".interfaces.IFormLocation"
+ factory=".selection.FormLocationProxy"
+ trusted="true"
+ />
- <adapter for=".interfaces.IFormLocation"
- provides=".interfaces.ISelection"
- factory=".selection.FormLocationSelection"
- />
+ <adapter for=".interfaces.IFormLocation"
+ provides=".interfaces.ISelection"
+ factory=".selection.FormLocationSelection"
+ />
- <adapter for="zope.interface.Interface
- zope.schema.interfaces.IField"
- factory=".sort.SchemaSorter"
- provides=".interfaces.ISorter"
- />
+ <adapter for="zope.interface.Interface
+ zope.schema.interfaces.IField"
+ factory=".sort.SchemaSorter"
+ provides=".interfaces.ISorter"
+ />
- <!-- namedtemplate for IParentAction -->
- <adapter factory=".multiform.render_submit_button" name="render" />
+ <!-- namedtemplate for IParentAction -->
+ <adapter factory=".multiform.render_submit_button" name="render" />
- <include package=".container"/>
+ <include package=".container"/>
</configure>
\ No newline at end of file
Modified: zope3org/trunk/src/zorg/multiform/container/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/multiform/container/interfaces.py 2006-04-12 10:28:30 UTC (rev 66880)
+++ zope3org/trunk/src/zorg/multiform/container/interfaces.py 2006-04-12 11:29:40 UTC (rev 66881)
@@ -1,5 +1,5 @@
+from zope import schema
from zope.app.location.interfaces import ILocation
-from zope import schema
from zope.interface import Interface, Attribute
class IMovableLocation(ILocation):
Modified: zope3org/trunk/src/zorg/multiform/container/location.py
===================================================================
--- zope3org/trunk/src/zorg/multiform/container/location.py 2006-04-12 10:28:30 UTC (rev 66880)
+++ zope3org/trunk/src/zorg/multiform/container/location.py 2006-04-12 11:29:40 UTC (rev 66881)
@@ -1,9 +1,11 @@
-from interfaces import IMovableLocation
from zope.interface import implements
+from zope.security.proxy import removeSecurityProxy
from zope.app.copypastemove.interfaces import IContainerItemRenamer
+
from multiform.interfaces import IFormLocation
-from zope.security.proxy import removeSecurityProxy
+from interfaces import IMovableLocation
+
class MovableLocation(object):
implements(IMovableLocation)
Modified: zope3org/trunk/src/zorg/multiform/container/views.py
===================================================================
--- zope3org/trunk/src/zorg/multiform/container/views.py 2006-04-12 10:28:30 UTC (rev 66880)
+++ zope3org/trunk/src/zorg/multiform/container/views.py 2006-04-12 11:29:40 UTC (rev 66881)
@@ -1,17 +1,14 @@
+import datetime
+import pytz
from zope.formlib.i18n import _
-from multiform import multiform, gridform
from zope.formlib import form
-from multiform.interfaces import ISelection
from zope.app.dublincore.interfaces import IWriteZopeDublinCore
from zope.app.size.interfaces import ISized
from zope.app.pagetemplate import ViewPageTemplateFile
from zope.app.location.interfaces import ILocation
-from interfaces import IMovableLocation
from zope.event import notify
from zope.app.event.objectevent import ObjectModifiedEvent
from zope.interface.common import idatetime
-import datetime
-import pytz
from zope.app import zapi
from zope.app.copypastemove.interfaces import IPrincipalClipboard
from zope.app.copypastemove.interfaces import IObjectCopier
@@ -21,9 +18,14 @@
from zope.security.interfaces import Unauthorized
from zope.app.traversing.interfaces import TraversalError
+from multiform import multiform, gridform
+from multiform.interfaces import ISelection
+from interfaces import IMovableLocation
+
def isSelected(form,action):
return ISelection(form.context).selected
+
def isSelectedInput(form,action):
print "isSelectedInput",form,form.inputMode,action.__name__,isSelected(form,action)
@@ -63,6 +65,7 @@
return True
+
def safe_getattr(obj, attr, default):
"""Attempts to read the attr, returning default if Unauthorized."""
try:
@@ -70,6 +73,7 @@
except Unauthorized:
return default
+
def hasClipboardContents(form, action):
""" interogates the `PrinicipalAnnotation` to see if
clipboard contents exist """
@@ -94,9 +98,8 @@
return False
+class ContainerItemForm(multiform.ItemFormBase):
-class ContainerItemForm(gridform.GridItemFormBase):
-
inputMode=False
forceInput=['selected']
template = ViewPageTemplateFile('griditem.pt')
@@ -135,7 +138,7 @@
self.newInputMode = False
-class ContainerGridForm(gridform.GridFormBase):
+class ContainerGridForm(multiform.MultiFormBase):
itemFormFactory=ContainerItemForm
@@ -291,6 +294,7 @@
else:
self.errors = (_("You didn't specify any ids to delete."),)
+
def getPrincipalClipboard(request):
"""Return the clipboard based on the request."""
user = request.principal
Modified: zope3org/trunk/src/zorg/multiform/gridform.py
===================================================================
--- zope3org/trunk/src/zorg/multiform/gridform.py 2006-04-12 10:28:30 UTC (rev 66880)
+++ zope3org/trunk/src/zorg/multiform/gridform.py 2006-04-12 11:29:40 UTC (rev 66881)
@@ -1,9 +1,8 @@
-
from zope.component import getMultiAdapter
+from zope.interface import implements
from zope.formlib import namedtemplate
-from zope.interface import implements
from zope.app.pagetemplate import ViewPageTemplateFile
-
+from zope.app.location.interfaces import ILocation
from interfaces import IGridForm, IGridItemForm, ISorter
import multiform
@@ -19,6 +18,7 @@
implements(IGridItemForm)
template = namedtemplate.NamedTemplate('default')
+
class GridFormBase(multiform.MultiFormBase):
implements(IGridForm)
@@ -35,10 +35,19 @@
class FilterMapping(object):
+
+ implements(ILocation)
def __init__(self, context, request, form):
self.context = context
self.request = request
+ if ILocation.providedBy(context):
+ self.__parent__ = context.__parent__
+ self.__name__ = context.__name__
+
+ else:
+ self.__parent__ = None
+ self.__name__ = u""
self.form = form
self.batch_start = request.form.get(
'%s.handle.batch_start' % form.prefix,0)
Modified: zope3org/trunk/src/zorg/multiform/gridform.txt
===================================================================
--- zope3org/trunk/src/zorg/multiform/gridform.txt 2006-04-12 10:28:30 UTC (rev 66880)
+++ zope3org/trunk/src/zorg/multiform/gridform.txt 2006-04-12 11:29:40 UTC (rev 66881)
@@ -308,4 +308,4 @@
TODO:
-----
-- test singleedit, singlesave
\ No newline at end of file
+- test singleedit, singlesave
Modified: zope3org/trunk/src/zorg/multiform/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/multiform/interfaces.py 2006-04-12 10:28:30 UTC (rev 66880)
+++ zope3org/trunk/src/zorg/multiform/interfaces.py 2006-04-12 11:29:40 UTC (rev 66881)
@@ -1,6 +1,6 @@
+from zope import schema
from zope.interface import Interface,Attribute
from zope.formlib.interfaces import IAction
-from zope import schema
from zope.formlib.i18n import _
Modified: zope3org/trunk/src/zorg/multiform/multiform.py
===================================================================
--- zope3org/trunk/src/zorg/multiform/multiform.py 2006-04-12 10:28:30 UTC (rev 66880)
+++ zope3org/trunk/src/zorg/multiform/multiform.py 2006-04-12 11:29:40 UTC (rev 66881)
@@ -1,19 +1,20 @@
+import copy
+from zope import interface
+from zope.component import getMultiAdapter
+from zope.interface import implements
+import zope.i18n
from zope.app.publisher.browser import BrowserView
-from zope.interface import implements
from zope.app import zapi
from zope.app.form.browser.interfaces import IWidgetInputErrorView
-from zope.component import getMultiAdapter
from zope.formlib import form
+from zope.formlib import namedtemplate
from zope.formlib.interfaces import IBoundAction
from zope.formlib.i18n import _
+
from interfaces import IMultiForm, IParentAction, IItemAction, ISelection
from interfaces import IFormLocation,IItemForm
-import copy
-from zope.formlib import namedtemplate
-import zope.i18n
-from zope import interface
-
+
def isFormDisplayMode(f,action):
return not f.inputMode
@@ -87,7 +88,6 @@
)
-
class itemAction(form.action):
def __call__(self, success):
@@ -95,6 +95,7 @@
self.actions.append(action)
return action
+
class parentAction(form.action):
def __call__(self, success):
More information about the Checkins
mailing list