[Checkins] SVN: z3ext.layoutform/trunk/src/z3ext/layoutform/

[Nikolay Kim]

Log message for revision 94310:
  

Changed:
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/subform.pt
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/utils.py

-=-
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml	2008-12-24 20:07:39 UTC (rev 94309)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml	2008-12-24 20:26:28 UTC (rev 94310)
@@ -65,7 +65,7 @@
   <z3ext:pagelet
      type="form"
      template="formgroup.pt"
-     for="z3c.form.group.Group"
+     for="z3c.form.interfaces.IGroup"
      layer="..interfaces.ILayoutFormLayer" />
 
   <!-- Error View -->

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt	2008-12-24 20:07:39 UTC (rev 94309)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt	2008-12-24 20:26:28 UTC (rev 94310)
@@ -1,7 +1,7 @@
 <div class="z-form-group">
   <h3 class="z-form-grouplabel"
       tal:content="context/label" tal:condition="context/label"></h3>
-  <div class="z-form-description" 
+  <div class="z-form-description"
        tal:condition="context/description|nothing"
        tal:content="context/description|nothing"></div>
   

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/subform.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/subform.pt	2008-12-24 20:07:39 UTC (rev 94309)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/subform.pt	2008-12-24 20:26:28 UTC (rev 94310)
@@ -1,6 +1,6 @@
 <div class="z-form-group">
-  <h1 class="z-form-label" 
-      tal:condition="context/label" tal:content="context/label">Do something</h1>
+  <h2 class="z-form-label" 
+      tal:condition="context/label" tal:content="context/label">Do something</h2>
   <div class="z-form-description"
        tal:condition="context/description" tal:content="context/description"></div>
   

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/utils.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/utils.py	2008-12-24 20:07:39 UTC (rev 94309)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/utils.py	2008-12-24 20:26:28 UTC (rev 94310)
@@ -25,10 +25,16 @@
         # If the field is not in the data, then go on to the next one
         if name not in data:
             continue
+
         # Get the datamanager and get the original value
         dm = getMultiAdapter((content, field.field), IDataManager)
         # Only update the data, if it is different
-        if dm.query() != data[name]:
+        try:
+            value = dm.get()
+        except:
+            value = object()
+
+        if value != data[name]:
             dm.set(data[name])
             # Record the change using information required later
             changes.setdefault(dm.field.interface, []).append(name)