From 4005d213fe5fa75047a29f38a55a0437421a9ee9 Mon Sep 17 00:00:00 2001 From: Adelson Date: Sat, 28 May 2022 23:48:04 -0300 Subject: [PATCH 1/2] Permitindo adicionar uma tupla contendo o contexto e o template num card --- sloth/app/dashboard.py | 11 +++++++-- sloth/app/templates/app/dashboard/cards.html | 26 +++++++++++--------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/sloth/app/dashboard.py b/sloth/app/dashboard.py index dbd1d196..e7daa7da 100644 --- a/sloth/app/dashboard.py +++ b/sloth/app/dashboard.py @@ -48,12 +48,19 @@ def to_item(self, model, count=True): def _load(self, key, models): allways = 'floating', 'navigation', 'settings', 'actions', 'menu', 'links' for model in models: - if model().has_list_permission(self.request.user) or model().has_permission(self.request.user): + if isinstance(model, (list, tuple)): + html = mark_safe(render_to_string(model[1], model[0], request=self.request)) + self.data[key].append( + dict( + html=html, + ) + ) + elif model().has_list_permission(self.request.user) or model().has_permission(self.request.user): if key in allways or self.request.path == '/app/': url = model.get_list_url('/app') add_item = True for item in self.data[key]: - add_item = add_item and not item['url'] == url + add_item = add_item and not item.get('url') == url if add_item: self.data[key].append( dict( diff --git a/sloth/app/templates/app/dashboard/cards.html b/sloth/app/templates/app/dashboard/cards.html index 1b94b243..acbb9321 100644 --- a/sloth/app/templates/app/dashboard/cards.html +++ b/sloth/app/templates/app/dashboard/cards.html @@ -25,18 +25,22 @@
{% for item in data.cards %} -
- - From 02858cca9e10ddf5c1b31f10dc9816107ef3f5de Mon Sep 17 00:00:00 2001 From: adelsonllima Date: Sun, 29 May 2022 00:24:50 -0300 Subject: [PATCH 2/2] =?UTF-8?q?Recuperando=20tamanho=20padr=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sloth/app/templates/app/dashboard/cards.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sloth/app/templates/app/dashboard/cards.html b/sloth/app/templates/app/dashboard/cards.html index acbb9321..2e763a9c 100644 --- a/sloth/app/templates/app/dashboard/cards.html +++ b/sloth/app/templates/app/dashboard/cards.html @@ -28,7 +28,7 @@ {% if item.html %} {{ item.html }} {% else %} -
+