slthcore 0.5.7__tar.gz → 0.5.9__tar.gz

{slthcore-0.5.7/slthcore.egg-info → slthcore-0.5.9}/PKG-INFO

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

{slthcore-0.5.7 → slthcore-0.5.9}/setup.py

@@ -4,7 +4,7 @@ install_requires = []
 
 setup(
     name='slthcore',
-    version='0.5.7',
+    version='0.5.9',
     packages=find_packages(),
     install_requires=install_requires,
     include_package_data=True,

{slthcore-0.5.7 → slthcore-0.5.9}/slth/application.py

@@ -206,17 +206,26 @@ class Application(metaclass=ApplicationMetaclass):
             photo = profile and profile.photo and build_url(request, profile.photo.url) or None
         else:
             user = profile = photo = None
+        
+        def contribute(endpoint_list, endpoint_name):
+            cls = ENDPOINTS[endpoint_name]
+            endpoint = cls().instantiate(request, None)
+            if endpoint.check_permission() and endpoint.contribute(entrypoint):
+                name = endpoint.get_verbose_name()
+                url = build_url(request, cls.get_api_url())
+                modal = cls.get_metadata("modal", False)
+                icon = cls.get_metadata("icon", None)
+                endpoint_list.append(dict(name=name, url=url, modal=modal, icon=icon))
+        
         endpoints = {"actions": [], "usermenu": [], "adder": [], "settings": [], "tools": [], "toolbar": []}
         for entrypoint in endpoints:
             for endpoint_name in getattr(self.dashboard, entrypoint):
-                cls = ENDPOINTS[endpoint_name]
-                endpoint = cls().instantiate(request, None)
-                if endpoint.check_permission() and endpoint.contribute(entrypoint):
-                    name = endpoint.get_verbose_name()
-                    url = build_url(request, cls.get_api_url())
-                    modal = cls.get_metadata("modal", False)
-                    icon = cls.get_metadata("icon", None)
-                    endpoints[entrypoint].append(dict(name=name, url=url, modal=modal, icon=icon))
+                contribute(endpoints[entrypoint], endpoint_name)
+
+        top = []
+        for endpoint_name in self.dashboard.top:
+            contribute(top, endpoint_name)
+        
         return dict(
             type="application",
             icon=icon,
@@ -229,6 +238,7 @@ class Application(metaclass=ApplicationMetaclass):
             footer=dict(
                 type="footer", version=self.version
             ),
+            top=top,
             oauth=self.oauth.serialize(),
             sponsors=self.sponsors
         )

{slthcore-0.5.7 → slthcore-0.5.9}/slth/endpoints/__init__.py

@@ -364,6 +364,9 @@ class QuerySetEndpoint(Generic[T], ModelEndpoint):
         modal = False
 
     def get(self) -> QuerySet:
+        return self.get_queryset()
+    
+    def get_queryset(self):
         return self.model.objects.contextualize(self.request)
     
     def get_verbose_name(self):
@@ -375,6 +378,9 @@ class ListEndpoint(Generic[T], ModelEndpoint):
         modal = False
 
     def get(self) -> QuerySet:
+        return self.get_queryset()
+
+    def get_queryset(self):
         return self.model.objects.all().contextualize(self.request).actions(*self.get_default_actions())
     
     def get_verbose_name(self):
@@ -398,16 +404,13 @@ class AddEndpoint(Generic[T], ModelEndpoint):
         self.instance = self.model()
 
     def get(self) -> FormFactory:
-        return self.formfactory()
+        return self.instance.formfactory()
 
     def get_instance(self):
         return self.instance
     
-    def formfactory(self):
-        return self.instance.formfactory()
-    
     def get_verbose_name(self):
-        return f'Cadastrar {self.model._meta.verbose_name}'
+        return getattr(self.Meta, 'verbose_name', f'Cadastrar {self.model._meta.verbose_name}')
 
 
 class ModelInstanceEndpoint(ModelEndpoint):
@@ -417,6 +420,9 @@ class ModelInstanceEndpoint(ModelEndpoint):
 
     def get_instance(self):
         return self.instance
+    
+    def check_instance(self):
+        return self.model.objects.all().filter(pk=self.instance.pk).apply_lookups(self.request.user).exists()
 
 
 class InstanceEndpoint(Generic[T], ModelInstanceEndpoint):

{slthcore-0.5.7 → slthcore-0.5.9}/slth/forms.py

@@ -366,7 +366,7 @@ class FormMixin:
                 data.update(scheduler=field.scheduler)
             elif ftype == "choice" or pick:
                 choiceurl = self._endpoint.base_url if self._endpoint else None
-                if name in self.request.GET and not choices_field_name:
+                if name in self.request.GET and not choices_field_name and f'{name}__autocomplete' not in self.request.GET:
                     data.update(type="hidden", value=self.request.GET[name])
                 else:
                     if choices_field_name == fname or (isinstance(field.choices, ModelChoiceIterator) and not pick):

{slthcore-0.5.7 → slthcore-0.5.9}/slth/queryset.py

@@ -156,6 +156,11 @@ class QuerySet(models.QuerySet):
             self.metadata['lookups'] = {}
         self.metadata['lookups'][role_name] = lookups
         return self
+    
+    def nolookup(self):
+        if 'lookups' in self.metadata:
+            self.metadata['lookups'].clear()
+        return self
 
     def apply_lookups(self, user):
         from . import permissions

{slthcore-0.5.7 → slthcore-0.5.9}/slth/serializer.py

@@ -411,6 +411,7 @@ class Serializer:
                     action = endpoint.get_api_metadata(self.request, base_url, self.obj.pk)
                 else:
                     action = endpoint.get_api_metadata(self.request, base_url)
+                action.update(counter=endpoint.get_queryset().apply_lookups(self.request.user).count())
                 todo.append(action)
         output = dict(type=self.type, title=self.title if self.show_title else None)
         if info: