Merge pull request #1218 from okfn/1218-remove-__extras

Hide __extras from extras on package_show
ckan · Nov 28, 2013 · fb0fcf1 · fb0fcf1
2 parents edda21c + cd580c6
commit fb0fcf1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
@@ -351,6 +351,7 @@ def default_extras_schema():
         'state': [ignore],
         'deleted': [ignore_missing],
         'revision_timestamp': [ignore],
+        '__extras': [ignore],
     }
     return schema
 

diff --git a/ckan/tests/functional/api/test_activity.py b/ckan/tests/functional/api/test_activity.py
@@ -573,17 +573,17 @@ def _update_extra(self, package_dict, user):
                 [group['name'] for group in package_dict['groups']],
                 apikey=apikey)
 
-        extras_before = package_dict['extras']
+        import copy
+        extras_before = copy.deepcopy(package_dict['extras'])
         assert len(extras_before) > 0, (
                 "Can't update an extra if the package doesn't have any")
 
         # Update the package's first extra.
-        extras = list(extras_before)
-        if extras[0]['value'] != '"edited"':
-            extras[0]['value'] = '"edited"'
+        if package_dict['extras'][0]['value'] != '"edited"':
+            package_dict['extras'][0]['value'] = '"edited"'
         else:
-            assert extras[0]['value'] != '"edited again"'
-            extras[0]['value'] = '"edited again"'
+            assert package_dict['extras'][0]['value'] != '"edited again"'
+            package_dict['extras'][0]['value'] = '"edited again"'
         updated_package = package_update(self.app, package_dict,
                 user['apikey'])