Merge branch 'master' into release

emmett-framework · Jan 18, 2022 · a2c5201 · a2c5201
2 parents fa5f50e + 47e4224
commit a2c5201
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -115,7 +115,7 @@ class Post(Model):
 
     default_values = {
         'user': lambda: session.auth.user.id,
-        'date': lambda: now
+        'date': now
     }
     validation = {
         'title': {'presence': True},
@@ -135,7 +135,7 @@ class Comment(Model):
 
     default_values = {
         'user': lambda: session.auth.user.id,
-        'date': lambda: now
+        'date': now
     }
     validation = {
         'text': {'presence': True}

diff --git a/emmett/__version__.py b/emmett/__version__.py
@@ -1 +1 @@
-__version__ = "2.4.0"
+__version__ = "2.4.1"
diff --git a/emmett/orm/models.py b/emmett/orm/models.py
@@ -321,7 +321,7 @@ def __parse_many_relation(self, item, singularize=True):
             if isinstance(rv.model, dict):
                 if 'method' in rv.model:
                     if 'field' in rv.model:
-                        rv.fields = [rv.model.field]
+                        rv.fields = [rv.model['field']]
                     else:
                         if len(self.primary_keys) > 1:
                             rv.fields = [

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Emmett"
-version = "2.4.0"
+version = "2.4.1"
 description = "The web framework for inventors"
 authors = ["Giovanni Barillari <[email protected]>"]
 license = "BSD-3-Clause"