Cherry-picked branch 'feature-1490-standard-package-output-from-logic…

…-layer'

ckan/lib/dictization/model_dictize.py

@@ -155,6 +155,11 @@ def package_dictize(pkg, context):
     q = select([rel_rev]).where(rel_rev.c.object_package_id == pkg.id)
     result = _execute_with_revision(q, rel_rev, context)
     result_dict["relationships_as_object"] = obj_list_dictize(result, context)
+    #isopen
+    # Get an actual Package object, not a PackageRevision
+    pkg_object = model.Package.get(pkg.id)
+    result_dict['isopen'] = pkg_object.isopen if isinstance(pkg_object.isopen,bool) else pkg_object.isopen()
+
     return result_dict
 
 def group_dictize(group, context):

ckan/logic/action/get.py

@@ -438,8 +438,11 @@ def group_package_show(context, data_dict):
     if limit:
         query = query.limit(limit)
 
-    pack_rev = query.all()
-    return _package_list_with_resources(context, pack_rev)
+    result = []
+    for pkg_rev in query.all():
+        result.append(package_dictize(pkg_rev,context))
+
+    return result
 
 def tag_show(context, data_dict):
     '''Shows tag details'''
@@ -457,9 +460,11 @@ def tag_show(context, data_dict):
     check_access('tag_show',context, data_dict)
 
     tag_dict = tag_dictize(tag,context)
+
     extended_packages = []
     for package in tag_dict['packages']:
-        extended_packages.append(_extend_package_dict(package,context))
+        pkg = model.Package.get(package['id'])
+        extended_packages.append(package_dictize(pkg,context))
 
     tag_dict['packages'] = extended_packages
 
@@ -682,8 +687,7 @@ def package_search(context, data_dict):
             log.warning('package %s in index but not in database' % package)
             continue
 
-        result_dict = table_dictize(pkg, context)
-        result_dict = _extend_package_dict(result_dict,context)
+        result_dict = package_dictize(pkg,context)
         results.append(result_dict)
 
     return {

ckan/model/package.py

@@ -189,6 +189,7 @@ def as_dict(self, ref_package_by='name', ref_group_by='name'):
         # Set 'license' in _dict to cater for old clients.
         # Todo: Remove from Version 2?
         _dict['license'] = self.license.title if self.license else _dict.get('license_id', '')
+        _dict['isopen'] = self.isopen()
         tags = [tag.name for tag in self.tags]
         tags.sort() # so it is determinable
         _dict['tags'] = tags

ckan/tests/lib/test_dictization.py

@@ -43,6 +43,7 @@ def setup_class(cls):
                         'name': u'roger',
                         'state': u'active',
                         'title': u"Roger's books"}],
+            'isopen': True,
             'license_id': u'other-open',
             'maintainer': None,
             'maintainer_email': None,