Merge pull request #91 from diggyk/master

Fixing bigger optimization issue with home page
dropbox · Nov 10, 2015 · f43dce9 · f43dce9
2 parents 27b92e0 + 270d74d
commit f43dce9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/hermes/models.py b/hermes/models.py
@@ -1392,12 +1392,11 @@ def to_dict(self, base_uri=None, expand=None, only_open_labors=False):
             "description": self.description,
         }
 
-        if only_open_labors:
-            labors = self.get_open_labors()
-        else:
-            labors = self.labors
-
         if "labors" in expand:
+            if only_open_labors:
+                labors = self.get_open_labors()
+            else:
+                labors = self.labors
             out['labors'] = [
                 labor.to_dict(base_uri=base_uri, expand=set(expand))
                 for labor in labors

diff --git a/hermes/version.py b/hermes/version.py
@@ -1 +1 @@
-__version__ = "0.5.6"
+__version__ = "0.5.7"