Merge pull request #64 from postatum/100377958_userself_400

Call ES.get_resource with ID from ACLs
ramses-tech · Aug 3, 2015 · 9d9bbe5 · 9d9bbe5
2 parents 6ef62e6 + 0f7710f
commit 9d9bbe5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ramses/acl.py b/ramses/acl.py
@@ -172,8 +172,7 @@ def getitem_es(self, key):
         """ Get item with ID of :key: from elasticsearch """
         from nefertari.elasticsearch import ES
         es = ES(self.__context_class__.__name__)
-        pk_field = self.__context_class__.pk_field()
-        obj = es.get_resource(**{pk_field: key})
+        obj = es.get_resource(id=key)
         obj.__acl__ = self.context_acl(obj)
         obj.__parent__ = self
         obj.__name__ = key

diff --git a/tests/test_acl.py b/tests/test_acl.py
@@ -268,7 +268,7 @@ def test_getitem_es(self, mock_es):
         obj.context_acl = Mock()
         value = obj.getitem_es(key='varvar')
         mock_es.assert_called_with('Foo')
-        es_obj.get_resource.assert_called_once_with(myname='varvar')
+        es_obj.get_resource.assert_called_once_with(id='varvar')
         obj.context_acl.assert_called_once_with(found_obj)
         assert value.__acl__ == obj.context_acl()
         assert value.__parent__ is obj