From 37e60417e544deb8686a1c9f668f86d57d89640b Mon Sep 17 00:00:00 2001 From: Steffen Gransow Date: Fri, 9 Sep 2016 10:04:55 +0000 Subject: [PATCH] temporarily "improve" modify error view by displaying validation errors globally. This is a temporary change that is necessary as the existing conflict resolution handling part in the error view doesn't work anymore. Command building etc. probably broke this. --- .../views/Resource/Modify/ModifyError.twig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/templates/html/views/Resource/Modify/ModifyError.twig b/app/templates/html/views/Resource/Modify/ModifyError.twig index f77d0d3d..6427cc07 100644 --- a/app/templates/html/views/Resource/Modify/ModifyError.twig +++ b/app/templates/html/views/Resource/Modify/ModifyError.twig @@ -1,5 +1,23 @@ {% extends _layout %} +{% block pageerrors %} +
+
+
+ {%- spaceless -%} +
+
    + {% for error in errors %} +
  • {{ error }}
  • + {% endfor %} +
+
+ {%- endspaceless -%} +
+
+
+{%- endblock pageerrors -%} +{# {% block toc %}

Resolve conflicts for {{ resource.identifier }}

{% endblock %} @@ -28,3 +46,4 @@ {% endblock %} +#}