Merge branch 'waskiqdev/master'

docs/source/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.21.1'
+version = '0.22.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.21.1'
+release = '0.22.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

formbar/form.py

@@ -14,6 +14,22 @@
 log = logging.getLogger(__name__)
 
 
+def get_sa_property(item, fieldname):
+    if not item:
+        return None
+
+    # Recursive handling of "dot.separated.field.names"
+    elif fieldname.find(".") > -1:
+        nameparts = fieldname.split(".")
+        return get_sa_property(getattr(item, ".".join(nameparts[0:-1])),
+                               nameparts[-1])
+    else:
+        mapper = sa.orm.object_mapper(item)
+        for prop in mapper.iterate_properties:
+            if prop.key == fieldname:
+                return prop
+
+
 def remove_ws(data):
     """Helper function which removes trailing and leading whitespaces
     for all values in the given dictionary. The dictionary usually
@@ -281,19 +297,12 @@ def deserialize(self, data):
         # Load relations of the item. Those are needed to deserialize
         # the relations.
         relation_names = {}
-        try:
-            mapper = sa.orm.object_mapper(self._item)
-            relation_properties = filter(
-                lambda p: isinstance(p,
-                                     sa.orm.properties.RelationshipProperty),
-                mapper.iterate_properties)
-            for prop in relation_properties:
-                relation_names[prop.key] = prop
-        except sa.orm.exc.UnmappedInstanceError:
-            if not self._item:
-                pass  # The form is not mapped to an item.
-            else:
-                raise
+
+        if self._item:
+            for fieldname in data.keys():
+                prop = get_sa_property(self._item, fieldname)
+                if isinstance(prop, sa.orm.properties.RelationshipProperty):
+                    relation_names[fieldname] = prop
 
         for fieldname, value in self._filter_values(data).iteritems():
             field = self.fields.get(fieldname)
@@ -682,17 +691,31 @@ def __getattr__(self, name):
         return getattr(self._config, name)
 
     def _get_sa_mapped_class(self):
-        # TODO: Raise Exception if this field is not a relation. (None)
-        # <2013-07-25 07:44>
-        return self.sa_property.mapper.class_
+        if self.name.find(".") > -1:
+            # Special handling for prefixed relations in case of
+            # included entities.
+            # Those included entities usually has a prefix which defines
+            # the path to the attribute.
+            #
+            # Example:
+            # If the fieldname ist "foo.bar" this means that the current
+            # item has a relation named "foo". And within this foo
+            # relation a value should be set in "bar".
+            #
+            # Unfortunately this special notation breaks the default
+            # procedure how to get the mapped class of this attribute.
+            path = self.name.split(".")
+            rel = getattr(self._form._item, ".".join(path[:-1]))
+            field = path[-1]
+            sa_property = get_sa_property(rel, field)
+            return sa_property.mapper.class_
+        else:
+            return self.sa_property.mapper.class_
 
     def _get_sa_property(self):
         if not self._form._item:
             return None
-        mapper = sa.orm.object_mapper(self._form._item)
-        for prop in mapper.iterate_properties:
-            if prop.key == self.name:
-                return prop
+        return get_sa_property(self._form._item, self.name)
 
     def get_type(self):
         """Returns the datatype of the field."""

formbar/static/js/formbar.js

@@ -700,8 +700,14 @@ var form = function (inputFilter, ruleEngine) {
     var setListener = function () {
         var timeOutID;
         var changeEvent = function(e){
-            if (formFields[e.target.name].state==='inactive'){
-                clearFieldValue(e.target.name);
+            var div = $(e.target);
+            var fieldName = e.target.name;
+            if (formFields[fieldName].state==='inactive'){
+                if (div.attr("reset-value") == "true") {
+                   clearFieldValue(fieldName);
+                } else {
+                    resetFieldValue(fieldName, formFields);
+                }
             } else {
                 inputChanged(e);
             }

setup.py

@@ -2,7 +2,7 @@
 import multiprocessing
 import sys, os
 
-version = '0.21.1'
+version = '0.22.0'
 
 setup(name='formbar',
     version=version,