[MERGE] forward port branch saas-15 up to 970be94f37

2017-12-05 16:46:14 +01:00
parent 519555054a 970be94f37
commit b8540eefe3
10 changed files with 109 additions and 62 deletions
@@ -81,7 +81,7 @@ class Serialized(fields.Field):
    }
    column_type = ('text', 'text')

-    def convert_to_column(self, value, record):
+    def convert_to_column(self, value, record, values=None):
        return json.dumps(value)

    def convert_to_cache(self, value, record, validate=True):