appier 1.34.8__tar.gz → 1.34.9__tar.gz

{appier-1.34.8/src/appier.egg-info → appier-1.34.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: appier
-Version: 1.34.8
+Version: 1.34.9
 Summary: Appier Framework
 Home-page: http://appier.hive.pt
 Author: Hive Solutions Lda.

{appier-1.34.8 → appier-1.34.9}/setup.py

@@ -44,7 +44,7 @@ def read_file(path):
 
 setuptools.setup(
     name="appier",
-    version="1.34.8",
+    version="1.34.9",
     author="Hive Solutions Lda.",
     author_email="development@hive.pt",
     description="Appier Framework",

{appier-1.34.8 → appier-1.34.9}/src/appier/model.py

@@ -661,26 +661,38 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
         # this is going to be used for operations on the parameters
         request = common.base().get_request()
 
-        # counts the total number of references according to the
+        # counts the total number of entities according to the
         # current filter value and then uses this value together
-        # with the skip value to calculate both the number of pages
+        # with the limit value to calculate both the number of pages
         # available for the current filter and the current page index
         # (note that the index is one index based)
         total = cls.count(*args, **kwargs)
-        count = total / float(limit)
-        count = math.ceil(count)
-        count = int(count)
         index = skip / float(limit)
         index = math.floor(index)
         index = int(index) + 1
 
-        # calculates the proper size of the current page being requested
-        # taking into account the total number of values and the limit
-        size = total % limit if index == count else limit
-        if size == 0 and total > 0:
-            size = limit
-        if total == 0:
-            size = 0
+        # forks logic for continuous and discrete paging, they
+        # require different calculations for the number of pages and
+        # the size of the current page
+        if total == None:
+            # sets the values to None in case the count is None
+            # because there's no way to calculate the number of pages
+            # for the model provider
+            count, size = None, None
+        else:
+            # calculates both the number of pages that are available
+            # for the current entity
+            count = total / float(limit)
+            count = math.ceil(count)
+            count = int(count)
+
+            # calculates the proper size of the current page being requested
+            # taking into account the total number of values and the limit
+            size = total % limit if index == count else limit
+            if size == 0 and total > 0:
+                size = limit
+            if total == 0:
+                size = 0
 
         # creates the base structure for the page populating with the
         # base values that may be used for display of the page
@@ -695,6 +707,8 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
             direction=request.params_f.get("direction", "descending"),
         )
 
+        # generates the query string for the context provided as keyword
+        # arguments, this can be used to generating sorting links for instance
         def generate(**kwargs):
             # creates the linear parameters list that is going to hold multiple
             # key and value tuple representing the multiple parameters
@@ -1760,6 +1774,11 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
         collection = adapter.collection_a(name)
         return collection
 
+    @classmethod
+    def _object_id(cls, value=None):
+        adapter = cls._adapter()
+        return adapter.object_id(value=value)
+
     @classmethod
     def _name(cls):
         # retrieves the class object for the current instance and then

{appier-1.34.8 → appier-1.34.9/src/appier.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: appier
-Version: 1.34.8
+Version: 1.34.9
 Summary: Appier Framework
 Home-page: http://appier.hive.pt
 Author: Hive Solutions Lda.