diff --git a/ckanext/nhs/helpers.py b/ckanext/nhs/helpers.py index b7eccca..62f1c6b 100644 --- a/ckanext/nhs/helpers.py +++ b/ckanext/nhs/helpers.py @@ -125,8 +125,14 @@ def get_latest_datasets(): return datasets def get_latest_resources(): - resources = model.Session.query(model.Resource).order_by( - model.Resource.last_modified.desc()).limit(5) + filter_private_resource = '%\\\\"level\\\\": \\\\"public\\\\"%' + resources = model.Session.query(model.Resource) \ + .join(model.Package) \ + .filter(model.Package.state == 'active') \ + .filter(model.Package.private == False) \ + .filter(model.Resource.state == 'active') \ + .filter("resource.extras ILIKE \'%s\'" %(filter_private_resource)) \ + .order_by(model.Resource.last_modified.desc()).limit(5) return resources def get_cookie_control_config(): diff --git a/ckanext/nhs/templates/home/layout1.html b/ckanext/nhs/templates/home/layout1.html index c4cc52e..a1f4982 100644 --- a/ckanext/nhs/templates/home/layout1.html +++ b/ckanext/nhs/templates/home/layout1.html @@ -29,8 +29,8 @@

Latest Updates

{% for resource in h.get_latest_resources() %}
- {% if resource['title'] %} - {% set resouce_title = resource['title'] %} + {% if resource['extras']['title'] %} + {% set resouce_title = resource['extras']['title'] %} {% elif resource['name'] %} {% set resouce_title = resource['name'] %} {% else %}