Merge branch 'master' of https://github.com/GeoNode/geonode

* 'master' of https://github.com/GeoNode/geonode: fix GeoNode#2573 (GeoNode#2754)
simod · Dec 1, 2016 · 064b1e3 · 064b1e3
2 parents c7b97d6 + f7d41c6
commit 064b1e3
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/geonode/base/autocomplete_light_registry.py b/geonode/base/autocomplete_light_registry.py
@@ -21,18 +21,27 @@
 import autocomplete_light
 
 from models import ResourceBase, Region, HierarchicalKeyword
+from guardian.shortcuts import get_objects_for_user
 
 
 class ResourceBaseAutocomplete(autocomplete_light.AutocompleteModelTemplate):
     choice_template = 'autocomplete_response.html'
+    model = ResourceBase
+
+    def choices_for_request(self):
+        permitted = get_objects_for_user(
+            self.request.user,
+            'base.view_resourcebase')
+        self.choices = self.choices.filter(id__in=permitted)
+
+        return super(ResourceBaseAutocomplete, self).choices_for_request()
 
 
 autocomplete_light.register(Region,
                             search_fields=['name'],
                             autocomplete_js_attributes={'placeholder': 'Region/Country ..', },)
 
-autocomplete_light.register(ResourceBase,
-                            ResourceBaseAutocomplete,
+autocomplete_light.register(ResourceBaseAutocomplete,
                             search_fields=['title'],
                             order_by=['title'],
                             limit_choices=100,