Merge branches 'KATA-1283' and 'KATA-1286'

ckanext/kata/controllers.py

@@ -903,11 +903,10 @@ def pager_url(q=None, page=None):
 
     def read(self, id):
         _or_ = sqlalchemy.or_
-        query = model.Session.query(model.Package, model.PackageExtra).filter(_or_(model.Package.name == id, model.Package.id == id)).join(model.PackageExtra).filter(model.PackageExtra.key == 'contact_0_email').first()
-
-        if query and len(query) == 2 and query[0].state == 'deleted':
-            c.org_title = model.Session.query(model.Group).filter(model.Group.id == query[0].owner_org).value('title')
-            c.distributor_email = query[1].value
+        query = model.Session.query(model.Package).filter(_or_(model.Package.name == id, model.Package.id == id)).first()
+        if query and query.state == 'deleted':
+            c.org = model.Session.query(model.Group).filter(model.Group.id == query.owner_org).first()
+            c.title_json = query.title
             return render('kata/tombstone.html')
 
         return super(KataPackageController, self).read(id)

ckanext/kata/helpers.py

@@ -511,7 +511,7 @@ def gtn_from_group(grp):
 
 def get_flat_hierarchy(organization):
     # Get a single organization based on data_dict's organization dict
-    query = model.Group.search_by_name_or_title(organization.get('name'), group_type=None, is_org=True)
+    query = model.Group.search_by_name_or_title(organization.get('name') if organization.get('name') else organization.name, group_type=None, is_org=True)
     org = query.first()
 
     parent_hierarchy = org.get_parent_group_hierarchy(type='organization')