From 86925907775274e6fccdddf9bda9b25806d0317e Mon Sep 17 00:00:00 2001 From: Brook Elgie Date: Fri, 11 Sep 2015 16:26:09 +0100 Subject: [PATCH 1/2] [#72] Fix org about page template inheritance --- ckanext/scheming/templates/scheming/organization/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckanext/scheming/templates/scheming/organization/about.html b/ckanext/scheming/templates/scheming/organization/about.html index 57ab9d6d..026379f0 100644 --- a/ckanext/scheming/templates/scheming/organization/about.html +++ b/ckanext/scheming/templates/scheming/organization/about.html @@ -1,4 +1,4 @@ -{% extends "group/about.html" %} +{% extends "organization/about.html" %} {% block primary_content_inner %}
From 7f5283e1c51124591955c7135332fa5cb69b6e81 Mon Sep 17 00:00:00 2001 From: Brook Elgie Date: Mon, 14 Sep 2015 16:44:54 +0100 Subject: [PATCH 2/2] [#72] Organization group_form.html changes --- .../templates/scheming/organization/group_form.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ckanext/scheming/templates/scheming/organization/group_form.html b/ckanext/scheming/templates/scheming/organization/group_form.html index fd72b12c..4c8d7bd3 100644 --- a/ckanext/scheming/templates/scheming/organization/group_form.html +++ b/ckanext/scheming/templates/scheming/organization/group_form.html @@ -16,10 +16,10 @@
{% block delete_button %} {% if h.check_access('group_delete', {'id': data.id}) and action=='edit' %} - {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Group?')}) %} - {% block delete_button_text %}{{ _('Delete') }}{% endblock %} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Organization?')}) %} + {% block delete_button_text %}{{ _('Delete') }}{% endblock %} {% endif %} {% endblock %} - +