slthcore 0.3.5__tar.gz → 0.3.6__tar.gz

{slthcore-0.3.5/slthcore.egg-info → slthcore-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slthcore
-Version: 0.3.5
+Version: 0.3.6
 Summary: API generator based on yml file
 Home-page: https://github.com/brenokcc
 Author: Breno Silva

{slthcore-0.3.5 → slthcore-0.3.6}/setup.py

@@ -5,7 +5,7 @@ install_requires = []
 
 setup(
     name='slthcore',
-    version='0.3.5',
+    version='0.3.6',
     packages=find_packages(),
     install_requires=install_requires,
     include_package_data=True,

{slthcore-0.3.5 → slthcore-0.3.6}/slth/endpoints/__init__.py

@@ -65,6 +65,7 @@ class Endpoint(metaclass=EnpointMetaclass):
     cache = cache
 
     def __init__(self):
+        self.baseurl = None
         self.request = None
         self.source = None
         self.instantiator = None
@@ -231,7 +232,9 @@ class Endpoint(metaclass=EnpointMetaclass):
             args = (source,) if cls.has_args() else ()
         else:
             args = (source.pk,) if cls.has_args() else ()
-        return cls(*args).configure(source).contextualize(request)
+        endpoint = cls(*args).configure(source).contextualize(request)
+        endpoint.baseurl = cls.get_api_url(*args)
+        return endpoint
 
     @classmethod
     def has_args(cls):

{slthcore-0.3.5 → slthcore-0.3.6}/slth/forms.py

@@ -9,7 +9,7 @@ from .models import Token, Profile
 from django.db import transaction
 from django.db.models import Manager
 from .exceptions import JsonResponseException
-from .utils import absolute_url, build_url
+from .utils import absolute_url, build_url, append_url
 from .serializer import Serializer
 from slth import ENDPOINTS
 from .components import Scheduler
@@ -351,6 +351,7 @@ class FormMixin:
             elif ftype == "scheduler":
                 data.update(scheduler=field.scheduler)
             elif ftype == "choice" or pick:
+                choiceurl = self._endpoint.baseurl if self._endpoint else None
                 if name in self.request.GET and not choices_field_name:
                     data.update(type="hidden", value=self.request.GET[name])
                 else:
@@ -364,7 +365,7 @@ class FormMixin:
                                 [dict(id=obj.id, value=str(obj).strip()) for obj in qs[0:(50 if pick else 25)]]
                             )
                         else:
-                            data["choices"] = absolute_url(
+                            data["choices"] = append_url(choiceurl, f"choices={fname}") if choiceurl else  absolute_url(
                                 self.request, f"choices={fname}"
                             )
                     else:
@@ -378,7 +379,7 @@ class FormMixin:
                                 dict(id=str(k), value=v) for k, v in field.choices
                             ]
                     if pick:
-                        data.update(pick=absolute_url(
+                        data.update(pick=append_url(choiceurl, f"choices={fname}") if choiceurl else  absolute_url(
                             self.request, f"choices={fname}"
                         ))
 

{slthcore-0.3.5 → slthcore-0.3.6}/slth/serializer.py

@@ -311,10 +311,8 @@ class Serializer:
                         returned = {}
                         endpoint = cls.instantiate(self.request, self.obj)
                         if endpoint.check_permission():
-                            if not lazy:
-                                self.request.subpath = cls.get_api_url(self.obj.id) if cls.has_args() else cls.get_api_url()
+                            if not lazy:                     
                                 returned = endpoint.process()
-                                del self.request.subpath
                             path = self.path + [key]
                             if wrap:
                                 data = dict(type='fieldset', key=key, title=title, url=None, data=serialize(returned))

{slthcore-0.3.5 → slthcore-0.3.6}/slth/utils.py

@@ -3,7 +3,7 @@ from django.template.engine import Engine
 
 
 def build_url(request, path=None):
-    return path or getattr(request, 'subpath', request.path) if request else ''
+    return path or request.path if request else ''
 
 def absolute_url(request, *querystrings):
     url = build_url(request)

{slthcore-0.3.5 → slthcore-0.3.6/slthcore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slthcore
-Version: 0.3.5
+Version: 0.3.6
 Summary: API generator based on yml file
 Home-page: https://github.com/brenokcc
 Author: Breno Silva