From 06b77ac7680cc70162c4efd54c5c6d0ea1b0abae Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanhammond@lavabit.com>
Date: Fri, 24 Feb 2012 16:48:56 +0100
Subject: [PATCH] [#1808] Rename tag 'display name' to 'display_name'

Consistent with display_name properties elsewhere
---
 ckan/lib/dictization/model_dictize.py     |  4 ++--
 ckan/logic/schema.py                      |  2 +-
 ckan/templates/_util.html                 |  2 +-
 ckan/tests/lib/test_dictization.py        | 10 +++++-----
 ckan/tests/lib/test_dictization_schema.py |  6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ckan/lib/dictization/model_dictize.py b/ckan/lib/dictization/model_dictize.py
index 64f31770ab6..1065989f5ff 100644
--- a/ckan/lib/dictization/model_dictize.py
+++ b/ckan/lib/dictization/model_dictize.py
@@ -210,9 +210,9 @@ def package_dictize(pkg, context):
     result_dict['metadata_created'] = pkg.metadata_created.isoformat() \
         if pkg.metadata_created else None
 
-    assert not result_dict.has_key('display name')
+    assert not result_dict.has_key('display_name')
     for tag in result_dict['tags']:
-        tag['display name'] = tag['name']
+        tag['display_name'] = tag['name']
 
     if context.get('for_view'):
         for item in PluginImplementations(IPackageController):
diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
index b1763501d41..b28b3c96332 100644
--- a/ckan/logic/schema.py
+++ b/ckan/logic/schema.py
@@ -85,7 +85,7 @@ def default_tags_schema():
         'vocabulary_id': [ignore_missing, unicode, vocabulary_id_exists],
         'revision_timestamp': [ignore],
         'state': [ignore],
-        'display name': [ignore_missing, ignore_empty, unicode],
+        'display_name': [ignore_missing, ignore_empty, unicode],
     }
     return schema
 
diff --git a/ckan/templates/_util.html b/ckan/templates/_util.html
index a98ddbdd423..e4a7234892c 100644
--- a/ckan/templates/_util.html
+++ b/ckan/templates/_util.html
@@ -28,7 +28,7 @@
   <ul py:def="tag_list(tags)" class="tags clearfix">
     <py:for each="tag in tags">
     <li py:if="not tag.get('vocabulary_id')">
-      ${h.link_to(tag['display name'], h.url_for(controller='tag', action='read', id=tag['name']))}
+      ${h.link_to(tag['display_name'], h.url_for(controller='tag', action='read', id=tag['name']))}
     </li>
     </py:for>
   </ul>
diff --git a/ckan/tests/lib/test_dictization.py b/ckan/tests/lib/test_dictization.py
index 74b5fd9680a..6d8d3516b22 100644
--- a/ckan/tests/lib/test_dictization.py
+++ b/ckan/tests/lib/test_dictization.py
@@ -98,11 +98,11 @@ def setup_class(cls):
                             u'webstore_url': None}],
             'state': u'active',
             'tags': [{'name': u'Flexible \u30a1',
-                        'display name': u'Flexible \u30a1',
+                        'display_name': u'Flexible \u30a1',
                         'state': u'active'},
-                     {'name': u'russian', 'display name': u'russian',
+                     {'name': u'russian', 'display_name': u'russian',
                          'state': u'active'},
-                     {'name': u'tolstoy', 'display name': u'tolstoy',
+                     {'name': u'tolstoy', 'display_name': u'tolstoy',
                          'state': u'active'}],
             'title': u'A Novel By Tolstoy',
             'url': u'http://www.annakarenina.com',
@@ -679,7 +679,7 @@ def test_13_get_package_in_past(self):
         second_dictized['name'] = u'annakarenina_changed2' 
         second_dictized['resources'][0]['url'] = u'new_url2' 
         second_dictized['tags'][0]['name'] = u'new_tag' 
-        second_dictized['tags'][0]['display name'] = u'new_tag' 
+        second_dictized['tags'][0]['display_name'] = u'new_tag' 
         second_dictized['extras'][0]['value'] = u'"new_value"' 
         second_dictized['state'] = 'pending'
 
@@ -707,7 +707,7 @@ def test_13_get_package_in_past(self):
             u'webstore_last_updated': None,
             u'webstore_url': None})
 
-        third_dictized['tags'].insert(1, {'name': u'newnew_tag', 'display name': u'newnew_tag', 'state': 'active'})
+        third_dictized['tags'].insert(1, {'name': u'newnew_tag', 'display_name': u'newnew_tag', 'state': 'active'})
         third_dictized['extras'].insert(0, {'key': 'david', 
                                          'value': u'"new_value"',
                                          'state': u'active'})
diff --git a/ckan/tests/lib/test_dictization_schema.py b/ckan/tests/lib/test_dictization_schema.py
index df2dc4f9165..e4287f76b00 100644
--- a/ckan/tests/lib/test_dictization_schema.py
+++ b/ckan/tests/lib/test_dictization_schema.py
@@ -88,11 +88,11 @@ def test_1_package_schema(self):
                                                 'size_extra': u'345',
                                                 'url': u'http://www.annakarenina.com/index.json'}],
                                  'tags': [{'name': u'Flexible \u30a1',
-                                           'display name': u'Flexible \u30a1'},
+                                           'display_name': u'Flexible \u30a1'},
                                           {'name': u'russian',
-                                           'display name': u'russian'},
+                                           'display_name': u'russian'},
                                           {'name': u'tolstoy',
-                                           'display name': u'tolstoy'}],
+                                           'display_name': u'tolstoy'}],
                                  'title': u'A Novel By Tolstoy',
                                  'url': u'http://www.annakarenina.com',
                                  'version': u'0.7a'}, pformat(converted_data)