Merge pull request #52 from peletiah/master

Typo in services/resource.py line 225 - 'GroupResourcePermission' has no attribute 'perm_id'
ergo · Feb 19, 2017 · 7a70bfd · 7a70bfd
2 parents 84881ca + 1968f21
commit 7a70bfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -43,3 +43,4 @@ Contributors:
 * Arian Maykon de Araújo Diógenes (arianmaykon) 2016-04-19
 * Edward Arghiroiu (themightyonyx) 2015-11-13
 * Łukasz Bołdys (utek) 2013-11-22
+* Christian Benke (peletiah) 2017-02-19
diff --git a/ziggurat_foundations/models/services/resource.py b/ziggurat_foundations/models/services/resource.py
@@ -222,7 +222,7 @@ def perm_by_group_and_perm_name(cls, resource_id, group_id, perm_name,
         query = query.filter(
             cls.models_proxy.GroupResourcePermission.group_id == group_id)
         query = query.filter(
-            cls.models_proxy.GroupResourcePermission.perm_id == perm_name)
+            cls.models_proxy.GroupResourcePermission.perm_name == perm_name)
         query = query.filter(
             cls.models_proxy.GroupResourcePermission.resource_id == resource_id)
         return query.first()