tina4-python 0.2.131__tar.gz → 0.2.133__tar.gz

{tina4_python-0.2.131 → tina4_python-0.2.133}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.131
+Version: 0.2.133
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.131 → tina4_python-0.2.133}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.131"
+version = "0.2.133"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.131 → tina4_python-0.2.133}/tina4_python/Template.py

@@ -35,9 +35,13 @@ class Template:
         Template.twig.add_extension('jinja2.ext.do')
         Template.twig.globals['RANDOM'] = RANDOM
         Template.twig.globals['json'] = json
+        Template.twig.globals['base64encode'] = Template.base64encode
+        Template.twig.filters['base64encode'] = Template.base64encode
         Template.twig.filters['detect_image'] = Template.detect_image
         Template.twig.filters['json_encode'] = json.dumps
-        Template.twig.filters['json_decode'] = json.loads
+        Template.twig.globals['json_encode'] = json.dumps
+        Template.twig.filters['json_decode'] = Template.json_decode
+        Template.twig.globals['json_decode'] = Template.json_decode
         Template.twig.filters['nice_label'] = Template.get_nice_label
         Template.twig.globals['formToken'] = Template.get_form_token
         Template.twig.filters['formToken'] = Template.get_form_token_input
@@ -54,8 +58,14 @@ class Template:
         Debug.error("DUMP FOUND ON PAGE!")
         return ""
 
+    @staticmethod
+    def json_decode(param):
+        param = html.unescape(param)
+        return ast.literal_eval(param)
+
     @staticmethod
     def dump(param):
+        param = html.unescape(param)
         if param is not None and not isinstance(param, Undefined):
             def json_serialize(obj):
                 if isinstance(obj, (date, datetime)):
@@ -68,6 +78,11 @@ class Template:
         else:
             return ""
 
+    @staticmethod
+    def base64encode(param):
+        value =  base64.b64encode(param.encode('utf-8')).decode('utf-8')
+        return value
+
     @staticmethod
     def get_form_token(payload={}):
         return tina4_python.tina4_auth.get_token(payload)

{tina4_python-0.2.131 → tina4_python-0.2.133}/tina4_python/templates/components/crud.twig

@@ -435,9 +435,7 @@
                 if (search) url.searchParams.set('search', search);
 
                 loadPage(url.toString(), "crudTarget{{ table_name }}", () => {
-                    const params = new URLSearchParams(location.search);
-                    const currentPage = Math.max(1, Math.floor((parseInt(params.get('offset') || 0) / limit)) + 1);
-                    renderPagination(currentPage);
+                    renderPagination(page);
                 });
             };