diff options
| -rw-r--r-- | archaeological_operations/wizards.py | 3 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 | ||||
| -rw-r--r-- | ishtar_common/utils.py | 11 |
3 files changed, 13 insertions, 3 deletions
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py index ba9709807..b0708f2db 100644 --- a/archaeological_operations/wizards.py +++ b/archaeological_operations/wizards.py @@ -437,7 +437,8 @@ class SiteModificationWizard(SiteWizard): modification = True -class SiteDeletionWizard(DeletionWizard): +class SiteDeletionWizard(SiteLabel, DeletionWizard): + SITE_KEY = 'deletion' model = models.ArchaeologicalSite fields = models.ArchaeologicalSite.TABLE_COLS + ['operations'] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 1db2ac4ea..aca5f9a34 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1706,11 +1706,13 @@ TRANSLATED_SITE_LABELS = { 'search': _(u"Site search"), 'new': _(u"New site"), 'modification': _(u"Site modification"), + 'deletion': _(u"Site deletion"), }, 'entity': { 'search': _(u"Archaeological entity search"), 'new': _(u"New archaeological entity"), 'modification': _(u"Archaeological entity modification"), + 'deletion': _(u"Archaeological entity deletion"), }, } diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 1c64f7940..94125ddb8 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -255,7 +255,7 @@ def regenerate_all_cached_labels(model): """ When the rule for generating cached label change. Regeneration of all label has to be done. - :param model: model class conecrned + :param model: model class concerned """ for item in model.all(): item.skip_history_when_saving = True @@ -292,6 +292,8 @@ def disable_for_loaddata(signal_handler): def _get_image_link(doc): + from ishtar_common.models import IshtarSiteProfile + # manage missing images if not doc.thumbnail or not doc.thumbnail.url or not doc.image \ or not doc.image.url: @@ -307,6 +309,11 @@ def _get_image_link(doc): # image attached to nothing... return "" + item_class_name = unicode(item.__class__._meta.verbose_name) + + if item.__class__.__name__ == "ArchaeologicalSite": + item_class_name = unicode(IshtarSiteProfile.get_default_site_label()) + return mark_safe(u""" <div class="col col-lg-3"> <div class="card"> @@ -332,7 +339,7 @@ def _get_image_link(doc): </script>""".format( doc.image.url, doc.thumbnail.url, - unicode(item.__class__._meta.verbose_name), + item_class_name, unicode(item), reverse(item.SHOW_URL, args=[item.pk, '']), unicode(_(u"Information")), |