Merge remote-tracking branch 'origin/373_do_not_strip_tracking_summary'

ckan · Feb 11, 2013 · dc99224 · dc99224
2 parents 57afa6d + cf0e3d7
commit dc99224
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
@@ -76,7 +76,7 @@ def default_resource_schema():
         'last_modified': [ignore_missing, isodate],
         'cache_last_updated': [ignore_missing, isodate],
         'webstore_last_updated': [ignore_missing, isodate],
-        'tracking_summary': [ignore],
+        'tracking_summary': [ignore_missing],
         '__extras': [ignore_missing, extras_unicode_convert, keep_extras],
     }
 

diff --git a/ckan/tests/lib/test_dictization_schema.py b/ckan/tests/lib/test_dictization_schema.py
@@ -88,12 +88,14 @@ def test_1_package_schema(self):
                                                 'format': u'plain text',
                                                 'hash': u'abc123',
                                                 'size_extra': u'123',
+                                                'tracking_summary': {'recent': 0, 'total': 0},
                                                 'url': u'http://www.annakarenina.com/download/x=1&y=2'},
                                                {'alt_url': u'alt345',
                                                 'description': u'Index of the novel',
                                                 'format': u'JSON',
                                                 'hash': u'def456',
                                                 'size_extra': u'345',
+                                                'tracking_summary': {'recent': 0, 'total': 0},
                                                 'url': u'http://www.annakarenina.com/index.json'}],
                                  'tags': [{'name': u'Flexible \u30a1'},
                                           {'name': u'russian'},