Merge pull request #7 from SmdhMdep/Fix-Protected-when-logged-in

Fix protected when logged in
SmdhMdep · Mar 22, 2023 · e8e1f1e · e8e1f1e
2 parents 8c48e9c + 03d4092
commit e8e1f1e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/ckanext/generalpublic/helper.py b/ckanext/generalpublic/helper.py
@@ -13,15 +13,13 @@ def is_public(packageid):
 
     data = {'packageid': packageid}
 
-    #TODO: get list of all visibilies that have Ckanmapping false and make them return a false
-
     visibility = tk.get_action('get_package_visibility')({'ignore_auth': True}, data)
 
     try: 
-        if visibility.visibility == "Protected":
-            return False
-        else:
+        if visibility.visibility == "Public":
             return True
+        else:
+            return False
     except:
-        return True
+        return False
 
diff --git a/ckanext/generalpublic/templates/package/snippets/resource_item.html b/ckanext/generalpublic/templates/package/snippets/resource_item.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 
 {% block resource_item_explore_links %}
-{%if h.is_public(pkg.id) %}
+{%if h.is_public(pkg.id) or c.userobj%}
   <li>
     <a href="{{ url }}">
       {% if not is_activity_archive and res.has_views %}
@@ -36,7 +36,7 @@
   {% endif %}
 {% else %}
   <li>
-    <a href="https://smdh.uk/#register">
+    <a href="https://mdep.smdh.uk/user/saml2login">
       <i class="fa fa-info-circle"></i>
       {{ _('Get Access to this data') }}
     </a>