diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-05-05 13:54:27 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-05-05 15:40:52 +0200 |
| commit | a9c7ae42db56a9b44eb6f84a9e15772ad7ea6739 (patch) | |
| tree | 36586f30c4584b7a575e6d8b0a3e671b0cf309b8 /ishtar_common | |
| parent | 5e0007ca2ab1354366cc76a2247088f021187c4f (diff) | |
| download | Ishtar-a9c7ae42db56a9b44eb6f84a9e15772ad7ea6739.tar.bz2 Ishtar-a9c7ae42db56a9b44eb6f84a9e15772ad7ea6739.zip | |
Add absolute URL to area and towns
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models_common.py | 32 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 1 |
2 files changed, 16 insertions, 17 deletions
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index cacb5664e..15ce429d4 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -1431,7 +1431,6 @@ class BaseHistorizedItem( """ IS_BASKET = False - SHOW_URL = None EXTERNAL_ID_KEY = "" EXTERNAL_ID_DEPENDENCIES = [] HISTORICAL_M2M = [] @@ -1674,21 +1673,6 @@ class BaseHistorizedItem( values[k] = getattr(self, k) return values - def get_absolute_url(self): - try: - return reverse("display-item", args=[self.SLUG, self.pk]) - except NoReverseMatch: - return - - def get_show_url(self): - show_url = self.SHOW_URL - if not show_url: - show_url = "show-" + self.__class__.__name__.lower() - try: - return reverse(show_url, args=[self.pk, ""]) - except NoReverseMatch: - return - @property def associated_filename(self): if [ @@ -3268,6 +3252,7 @@ class MainItem(ShortMenuItem, SerializeItem): QUICK_ACTIONS = [] SLUG = "" + SHOW_URL = None DOWN_MODEL_UPDATE = [] INITIAL_VALUES = [] # list of field checkable if changed on save @@ -3324,6 +3309,21 @@ class MainItem(ShortMenuItem, SerializeItem): def class_verbose_name(cls): return cls._meta.verbose_name + def get_absolute_url(self): + try: + return reverse("display-item", args=[self.SLUG, self.pk]) + except NoReverseMatch: + return + + def get_show_url(self): + show_url = self.SHOW_URL + if not show_url: + show_url = "show-" + self.__class__.__name__.lower() + try: + return reverse(show_url, args=[self.pk, ""]) + except NoReverseMatch: + return + @classmethod def get_columns(cls, table_cols_attr="TABLE_COLS", dict_col_labels=True): """ diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index 13ea27720..d7188faf5 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -1674,7 +1674,6 @@ class SearchWizard(IshtarWizard): slug = "archaeologicalsite" app_label = self.model.__module__.split(".")[0] try: - app_label = self.model.__module__.split(".")[0] sq = models.SearchQuery.objects.get( pk=bookmark, content_type__app_label=app_label, |