From db6f3f2152bfb480915a63ae04e88f2979d23341 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 28 Oct 2021 23:23:26 +0200 Subject: Syndication - search interface --- ishtar_common/wizards.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'ishtar_common/wizards.py') diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index 2c2d4f6f9..dff2bf2c5 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -124,13 +124,19 @@ class IshtarWizard(NamedUrlWizardView): and "pk" in form.fields and self.request.session.get("EXTERNAL_SOURCES", {}) ): - model_name = f"{self.model._meta.app_label}-{self.model.__name__.lower()}" - context["external_sources"] = [ - source.split("-") - for source in self.request.session["EXTERNAL_SOURCES"] - if model_name in self.request.session["EXTERNAL_SOURCES"][source] - ] - form.fields["pk"].widget.external_sources = context["external_sources"] + base_model_name = self.model.__name__.lower() + model_name = f"{self.model._meta.app_label}-{base_model_name}" + context["external_sources"] = [] + for source in self.request.session["EXTERNAL_SOURCES"]: + if model_name in self.request.session["EXTERNAL_SOURCES"][source]: + try: + src_id, lbl = source.split("||") + except ValueError: + continue + url = reverse("search-external", args=[base_model_name, src_id]) + context["external_sources"].append((src_id, lbl, url)) + + form.fields["pk"].widget.external_sources = context["external_sources"] open_item_id = self.request.GET.get("open_item", None) if open_item_id and self.model and getattr(self.model, "SHOW_URL", None): -- cgit v1.2.3