From eb5da18bfa7147999acccaa9f3251104769c9793 Mon Sep 17 00:00:00 2001
From: sagarggh <sagar.ghimire@datopian.com>
Date: Mon, 6 Dec 2021 12:38:36 +0545
Subject: [PATCH 1/4] [Improve][s] don't show draft and private resources on
 latest resource homepage feed

---
 ckanext/nhs/helpers.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ckanext/nhs/helpers.py b/ckanext/nhs/helpers.py
index b7eccca..60cfb1f 100644
--- a/ckanext/nhs/helpers.py
+++ b/ckanext/nhs/helpers.py
@@ -125,8 +125,12 @@ 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)
+    resources = model.Session.query(model.Resource) \
+         .join(model.Package) \
+         .filter(model.Package.state == 'active') \
+         .filter(model.Package.private == False) \
+         .filter(model.Resource.state == 'active') \
+         .order_by(model.Resource.last_modified.desc()).limit(5)
     return resources
 
 def get_cookie_control_config():

From 48f751947df432b1c25c85ad72bad24aa33fca19 Mon Sep 17 00:00:00 2001
From: sagarggh <sagar.ghimire@datopian.com>
Date: Mon, 6 Dec 2021 20:47:43 +0545
Subject: [PATCH 2/4] [improve][xs] resource feed don't show if resource is
 private

---
 ckanext/nhs/helpers.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ckanext/nhs/helpers.py b/ckanext/nhs/helpers.py
index 60cfb1f..d28d15d 100644
--- a/ckanext/nhs/helpers.py
+++ b/ckanext/nhs/helpers.py
@@ -125,11 +125,13 @@ def get_latest_datasets():
     return datasets
 
 def get_latest_resources():
+    filter_private_resource = '%"restricted": "{\\\\"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
 

From d09c8728ae098d8325f3701fde07dd5c2baea5a3 Mon Sep 17 00:00:00 2001
From: sagarggh <sagar.ghimire@datopian.com>
Date: Tue, 7 Dec 2021 09:26:10 +0545
Subject: [PATCH 3/4] [improve][xs] filter works even if dict has allowed_users
 property

---
 ckanext/nhs/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/nhs/helpers.py b/ckanext/nhs/helpers.py
index d28d15d..62f1c6b 100644
--- a/ckanext/nhs/helpers.py
+++ b/ckanext/nhs/helpers.py
@@ -125,7 +125,7 @@ def get_latest_datasets():
     return datasets
 
 def get_latest_resources():
-    filter_private_resource = '%"restricted": "{\\\\"level\\\\": \\\\"public\\\\"%'
+    filter_private_resource = '%\\\\"level\\\\": \\\\"public\\\\"%'
     resources = model.Session.query(model.Resource) \
          .join(model.Package) \
          .filter(model.Package.state == 'active') \

From b29b140d5ae0559cab79e64b4feb0095ca5274a2 Mon Sep 17 00:00:00 2001
From: sagarggh <sagar.ghimire@datopian.com>
Date: Wed, 8 Dec 2021 08:27:18 +0545
Subject: [PATCH 4/4] [improve][xs] show title instead of name on homepage
 recent dataset feed

---
 ckanext/nhs/templates/home/layout1.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@ <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 %}