diff --git a/ckan/lib/changes.py b/ckan/lib/changes.py index b9383a6eb29..5a0cad08fd4 100644 --- a/ckan/lib/changes.py +++ b/ckan/lib/changes.py @@ -567,8 +567,8 @@ def _extension_fields(change_list, old, new): change_list.append({u'type': u'extension_fields', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': field, - u'new_field': new[field]}) + u'key': field, + u'value': new[field]}) def _extra_fields(change_list, old, new): @@ -595,22 +595,22 @@ def _extra_fields(change_list, old, new): u'method': u'add1', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': new_fields[0], - u'field_val': + u'key': new_fields[0], + u'value': extra_fields_new[new_fields[0]]}) else: change_list.append({u'type': u'extra_fields', u'method': u'add2', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': new_fields[0]}) + u'key': new_fields[0]}) elif len(new_fields) > 1: change_list.append({u'type': u'extra_fields', u'method': u'add3', u'pkg_id': new['id'], u'title': new['title'], - u'fields': new_fields, - u'field_vals': extra_fields_new}) + u'key_list': new_fields, + u'values': extra_fields_new}) # if some fields were deleted deleted_fields = list(extra_old_set - extra_new_set) @@ -619,13 +619,13 @@ def _extra_fields(change_list, old, new): u'method': u'remove1', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': deleted_fields[0]}) + u'key': deleted_fields[0]}) elif len(deleted_fields) > 1: change_list.append({u'type': u'extra_fields', u'method': u'remove2', u'pkg_id': new['id'], u'title': new['title'], - u'fields': deleted_fields}) + u'key_list': deleted_fields}) # if some existing fields were changed # list of extra fields in both the old and new versions @@ -637,18 +637,18 @@ def _extra_fields(change_list, old, new): u'method': u'change1', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': field, - u'field_val_old': + u'key': field, + u'old_value': extra_fields_old[field], - u'field_val_new': + u'new_value': extra_fields_new[field]}) else: change_list.append({u'type': u'extra_fields', u'method': u'change2', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': field, - u'field_val_new': + u'key': field, + u'new_value': extra_fields_new[field]}) # if the old version didn't have an extras field, @@ -661,23 +661,23 @@ def _extra_fields(change_list, old, new): u'method': u'add1', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': new_fields[0], - u'field_val': + u'key': new_fields[0], + u'value': extra_fields_new[new_fields[0]]}) else: change_list.append({u'type': u'extra_fields', u'method': u'add2', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': new_fields[0]}) + u'key': new_fields[0]}) elif len(new_fields) > 1: change_list.append({u'type': u'extra_fields', u'method': u'add3', u'pkg_id': new['id'], u'title': new['title'], - u'fields': new_fields, - u'field_vals': extra_fields_new}) + u'key_list': new_fields, + u'values': extra_fields_new}) elif u'extras' in old: deleted_fields = _extras_to_dict(old['extras']).keys() @@ -686,10 +686,10 @@ def _extra_fields(change_list, old, new): u'method': u'remove1', u'pkg_id': new['id'], u'title': new['title'], - u'field_name': deleted_fields[0]}) + u'key': deleted_fields[0]}) elif len(deleted_fields) > 1: change_list.append({u'type': u'extra_fields', u'method': u'remove2', u'pkg_id': new['id'], u'title': new['title'], - u'fields': deleted_fields}) + u'key_list': deleted_fields}) diff --git a/ckan/templates/snippets/changes/extension_fields.html b/ckan/templates/snippets/changes/extension_fields.html index 552eb5a606d..858281d8087 100644 --- a/ckan/templates/snippets/changes/extension_fields.html +++ b/ckan/templates/snippets/changes/extension_fields.html @@ -1,11 +1,11 @@
- {{ _('Changed value of field {field_name}
to {new_field}
in
+ {{ _('Changed value of field {key}
to {value}
in
{dataset}').format(
pkg_url = h.url_for(controller='dataset', action='read', id=ah.pkg_id),
dataset = ah.title,
- field_name = ah.field_name,
- new_field = ah.new_field
+ key = ah.key,
+ value = ah.value
)|safe }}
{% if ah.method == "add1" %}
- {{ _('Added field {field_name}
with value
- {field_val}
to {dataset}').format(
+ {{ _('Added field {key}
with value
+ {value}
to {dataset}').format(
pkg_url = h.url_for(controller='dataset', action='read', id=ah.pkg_id),
dataset = ah.title,
- field_name = ah.field_name,
- field_val = ah.field_val
+ key = ah.key,
+ value = ah.value
)|safe }}
{% elif ah.method == "add2" %}
- {{ _('Added field {field_name}
+ {{ _('Added field {key}
to {dataset}').format(
pkg_url = h.url_for(controller='dataset', action='read', id=ah.pkg_id),
dataset = ah.title,
- field_name = ah.field_name
+ key = ah.key
)|safe }}
{% elif ah.method == "add3" %}
{{ _('Added the following fields to {dataset}
@@ -22,12 +22,12 @@
dataset = ah.title
)|safe }}
- {% for item in ah.fields %}
+ {% for item in ah.key_list %}
{% elif ah.method == "change1" %}
- {{ _('Changed value of field {field}
to {new_val}
+ {{ _('Changed value of field {key}
to {new_val}
(previously {old_val}
) in
{dataset}').format(
pkg_url = h.url_for(controller='dataset', action='read', id=ah.pkg_id),
dataset = ah.title,
- field = ah.field_name,
- new_val = ah.field_val_new,
- old_val = ah.field_val_old
+ key = ah.key,
+ new_val = ah.new_value,
+ old_val = ah.old_value
)|safe }}
{% elif ah.method == "change2" %}
- {{ _('Changed value of field {field}
to {new_val}
+ {{ _('Changed value of field {key}
to {new_val}
in {dataset}').format(
pkg_url = h.url_for(controller='dataset', action='read', id=ah.pkg_id),
dataset = ah.title,
- field = ah.field_name,
- new_val = ah.field_val_new,
+ key = ah.key,
+ new_val = ah.new_value,
)|safe }}
{% elif ah.method == "remove1" %}
- {{ _('Removed field {field}
from
+ {{ _('Removed field {key}
from
{dataset}').format(
pkg_url = h.url_for(controller='dataset', action='read', id=ah.pkg_id),
dataset = ah.title,
- field = ah.field_name,
+ key = ah.key,
)|safe }}
{% elif ah.method == "remove2" %}
{{ _('Removed the following fields from {dataset}
@@ -69,10 +69,10 @@
dataset = ah.title
)|safe }}
- {% for item in ah.fields %}
+ {% for item in ah.key_list %}
{field}
').format(
- field = item
+ {{ _('{key}
').format(
+ key = item
)| safe }}