From 0d009c8e455797f48bf702303048cfda3f18a717 Mon Sep 17 00:00:00 2001 From: amercader Date: Tue, 13 Aug 2013 10:40:43 +0100 Subject: [PATCH] Tweak resource query --- ckan/logic/action/get.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index c9c91ea2ee4..f4f5c1f6e1a 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -1474,8 +1474,11 @@ def resource_search(context, data_dict): offset = data_dict.get('offset') limit = data_dict.get('limit') - # TODO: should we check for user authentication first? - q = model.Session.query(model.Resource) + q = model.Session.query(model.Resource).join(model.ResourceGroup).join(model.Package) + q = q.filter(model.Package.state == 'active') + q = q.filter(model.Package.private == False) + q = q.filter(model.Resource.state == 'active') + resource_fields = model.Resource.get_columns() for field, terms in fields.items():