Revert "#276 Coupled Resource - fix to not show withdrawn packages in…

… list of coupled resources." Reverting changes for "#276 Coupled Resource" on master as it is INSPIRE-specific. Moving to datagovuk/ckanext-spatial branch dgu. This reverts commit 3f627d9.
ckan · Feb 4, 2013 · 84b75ea · 84b75ea
1 parent 27c4ee8
commit 84b75ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/ckanext/spatial/harvesters.py b/ckanext/spatial/harvesters.py
@@ -64,8 +64,6 @@ def text_traceback():
 
 class SpatialHarvester(object):
     # Q: Why does this not inherit from HarvesterBase in ckanext-harvest?
-    # A: HarvesterBase just provides some useful util methods. The key thing
-    #    a harvester does is it implements(IHarvester).
 
     def _is_wms(self,url):
         try:

diff --git a/ckanext/spatial/lib/helpers.py b/ckanext/spatial/lib/helpers.py
@@ -12,9 +12,7 @@ def get_coupled_packages(pkg):
         coupled_packages = \
                   [(couple.service_record.name, couple.service_record.title) \
                    for couple in coupled_resources \
-                   if couple.service_record_package_id and \
-                   couple.service_record and \
-                   couple.service_record.state == 'active']
+                   if couple.service_record_package_id]
         return coupled_packages
 
     elif res_type == 'service':
@@ -23,8 +21,6 @@ def get_coupled_packages(pkg):
         coupled_packages = \
                   [(couple.dataset_record.name, couple.dataset_record.title) \
                    for couple in coupled_resources \
-                   if couple.dataset_record_package_id and \
-                   couple.dataset_record and \
-                   couple.dataset_record.state == 'active']
+                   if couple.dataset_record_package_id]
         return coupled_packages