Merge pull request #4 from datopian/fix/improve-recent-resources

Improve the "Latest Updates" feed on the homepage.
datopian · Dec 8, 2021 · 6748f73 · 6748f73
2 parents f122396 + b29b140
commit 6748f73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -29,8 +29,8 @@ <h2 class="section-heading" id="new-datasets">Latest Updates</h2>
             {% for resource in h.get_latest_resources() %}
               <div class="single-list">
                 <a href="/dataset/{{resource['package_id']}}/resource/{{resource['id']}}">
-                {% 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 %}