diff options
| -rw-r--r-- | archaeological_finds/models_treatments.py | 33 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html | 4 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 23 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/error.html | 9 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/success.html | 2 | ||||
| -rw-r--r-- | ishtar_common/urls.py | 5 | ||||
| -rw-r--r-- | ishtar_common/views.py | 4 |
7 files changed, 76 insertions, 4 deletions
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 9b5ca5760..4a687e56e 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -1963,6 +1963,7 @@ class StatementCondition( obj.initial = True obj.last = False obj.verification_officer = None + obj.treatment = None for k in ("campaign_number", "report_number", "observations"): setattr(obj, k, "") # reinit with find fields @@ -2022,6 +2023,38 @@ class StatementCondition( # set last field and applied state self.__class__.objects.filter(pk=self.pk).update(last=True, applied=self.applied) + def delete(self, using=None, keep_parents=False) -> bool: + self._error = None + find_id, initial = self.find_id, self.initial + q_has_statements = self.__class__.objects.filter( + find_id=find_id, initial=False) + if initial and q_has_statements.count(): + # don't delete initial if there is statement condition + self._error = _("Initial state cannot be deleted if there is other statement condition.") + return + nb, __ = super().delete(using=using, keep_parents=keep_parents) + if not nb: + self._error = _("An unknow error occured.") + return + if initial: # no more statements conditions associated + return True + if not q_has_statements.count(): + # no current statement condition left for this find + # delete initial + q_initial = self.__class__.objects.filter( + find_id=find_id, initial=True) + if q_initial.count(): + q_initial.all()[0].delete() + return True + + last = q_has_statements.order_by("-date").all()[0] + if last.last: + return True # last is the last + last.last = True + last.save() + q_has_statements.exclude(pk=last.pk).update(last=False) + return True + def save(self, *args, **kwargs): apply_validation = False if self.applied in ("V", "T"): diff --git a/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html b/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html index 23667852c..c994f3888 100644 --- a/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html +++ b/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html @@ -19,11 +19,9 @@ <a class="wait-button btn btn-success" href="/document/create/?statementcondition={{statement_condition.pk}}" title="Ajouter un document / une image"> <i class="fa fa-plus"></i> doc./image </a> - {% if statement_condition.applied == "D" %} - <a class="btn btn-danger wait-button" href="#" data-target="{% url 'find-statement-condition-delete' statement_condition.pk %}" title="{% trans 'Delete' %}"> + <a class="btn-qa btn btn-danger" href="#" data-target="{% url 'find-statement-condition-delete' statement_condition.pk %}" title="{% trans 'Delete' %}"> <i class="fa fa-trash" aria-hidden="true"></i> </a> - {% endif %} </div> </div> {% endif %} diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index cde528a05..a805fb64b 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -19,6 +19,7 @@ from collections import OrderedDict import json +import urllib.parse from django.conf import settings from django.core.exceptions import PermissionDenied @@ -1631,4 +1632,24 @@ def statement_condition_form(request, find_pk, statement_condition_pk=None, "url": reverse(url, args=url_args) }) -statement_condition_delete_form = statement_condition_form + +def statement_condition_delete_form( + request, statement_condition_pk=None, current_right=None): + try: + item = models.StatementCondition.objects.get(pk=statement_condition_pk) + except models.StatementCondition.DoesNotExist: + raise Http404() + # permission not provided + if not current_right: + raise PermissionDenied() + # specificaly check permission for own item, otherwise already checked + if "_own_" in current_right: + if not request.user.has_perm(current_right, item.find): + raise PermissionDenied() + if item.delete(): + return HttpResponseRedirect(reverse("success")) + error = "" + if hasattr(item, "_error") and item._error: + error = urllib.parse.quote_plus(str(item._error)) + return HttpResponseRedirect( + reverse("error") + f"?message={error}") diff --git a/ishtar_common/templates/ishtar/forms/error.html b/ishtar_common/templates/ishtar/forms/error.html new file mode 100644 index 000000000..7bedbabf2 --- /dev/null +++ b/ishtar_common/templates/ishtar/forms/error.html @@ -0,0 +1,9 @@ +{% extends "ishtar/forms/success.html" %} +{% load i18n inline_formset table_form %} +{% block main_content %} +{% if message %} +{{ message }} +{% else %} +{% trans "An error has been encountered. It may be necessary to refresh the table/sheet." %} +{% endif %} +{% endblock %} diff --git a/ishtar_common/templates/ishtar/forms/success.html b/ishtar_common/templates/ishtar/forms/success.html index a3885a813..21bd27dcb 100644 --- a/ishtar_common/templates/ishtar/forms/success.html +++ b/ishtar_common/templates/ishtar/forms/success.html @@ -29,11 +29,13 @@ $(document).ready(function(){ </button> </div> <div class="modal-body form-row"> + {% block main_content %} {% if message %} {{ message }} {% else %} {% trans "Changes made successfully. It may be necessary to refresh the table/sheet." %} {% endif %} + {% endblock %} </div> </div> </div> diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index 827e85a7a..201e4fdbc 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -414,6 +414,11 @@ urlpatterns = [ views.SuccessView.as_view(), name="success", ), + re_path( + r"^error(?:/(?P<context>[a-z-]+)(?:/(?P<arg>[0-9a-z-|]+))?)?/$", + views.ErrorView.as_view(), + name="error", + ), ] menu = Menu(None) diff --git a/ishtar_common/views.py b/ishtar_common/views.py index dbaf8626b..03ab3f3f4 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -3258,6 +3258,10 @@ class SuccessView(TemplateView): return data +class ErrorView(SuccessView): + template_name = "ishtar/forms/error.html" + + class BookmarkList( SearchQueryMixin, JSONResponseMixin, LoginRequiredMixin, TemplateView ): |