LP #1061247: Fix ZMI properties edit form for properties named method.

zopefoundation · Oct 21, 2012 · d08308f · d08308f
1 parent e92a261
commit d08308f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/doc/CHANGES.rst b/doc/CHANGES.rst
@@ -18,6 +18,8 @@ http://docs.zope.org/zope2/releases/.
   - repoze.tm2 = 1.0
   - tempstorage = 2.12.2
 
+- LP #1061247: Fix ZMI properties edit form for properties named `method`.
+
 - LP #1058049: Fix support for zoperunner section in zope.conf.
 
 - Explicitly close all databases on shutdown, which ensures `Data.fs.index`

diff --git a/src/OFS/PropertyManager.py b/src/OFS/PropertyManager.py
@@ -299,9 +299,9 @@ def manage_editProperties(self, REQUEST):
             name = prop['id']
             if 'w' in prop.get('mode', 'wd'):
                 if prop['type'] == 'multiple selection':
-                    value = REQUEST.get(name, [])
+                    value = REQUEST.form.get(name, [])
                 else:
-                    value = REQUEST.get(name, '')
+                    value = REQUEST.form.get(name, '')
                 self._updateProperty(name, value)
         if REQUEST:
             message = "Saved changes."
@@ -316,8 +316,11 @@ def manage_changeProperties(self, REQUEST=None, **kw):
         name=value parameters
         """
         if REQUEST is None:
-            props={}
-        else: props=REQUEST
+            props = {}
+        elif isinstance(REQUEST, dict):
+            props = REQUEST
+        else:
+            props = REQUEST.form
         if kw:
             for name, value in kw.items():
                 props[name]=value