From 1c148cc8cdaccfbd4e6e506aa2fd35e53920ddf0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 24 Mar 2025 18:04:01 +0100 Subject: ♻️ django 3.2 - new version of libraries: fix errors and deprecation warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/views_item.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ishtar_common/views_item.py') diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index e731d42ba..f7a2ca1ea 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -261,7 +261,7 @@ def new_qa_item( model, frm, many=False, template="ishtar/forms/qa_new_item.html", page_name="", callback=None ): - def func(request, parent_name, limits=""): + def func(request, parent_name=None, limits=""): not_permitted_msg = ugettext("Operation not permitted.") meta = model._meta permission = f"{meta.app_label}.add_{meta.model_name}" @@ -898,7 +898,7 @@ def _parse_parentheses_groups( exc_dct = {} if not extra_distinct_q: extra_distinct_q = [] - if type(groups) is not list: + if not isinstance(groups, list): string = groups.strip() if string.startswith('"') and string.endswith('"') and string.count('"') == 2: string = string[1:-1] @@ -2743,8 +2743,10 @@ def get_item( and_reqs[:] ) - # print("ishtar_common/views_item.py - 2515") - # print(query, distinct_queries, base_query, exc_query, extras) + # print("ishtar_common/views_item.py - 2745") + # print(f"query: {query}", f"distinct_queries: {distinct_queries}", + # f"base_query: {base_query}", f"exc_query: {exc_query}", + # f"extras: {extras}") sub_items = model.objects.filter(query) for d_q in distinct_queries: sub_items = sub_items.filter(d_q) -- cgit v1.2.3