Merge pull request #31 from renderbox/develop

Release v0.2.11

Author: devo-wm

permafrost/__version__.py

@@ -1 +1 @@
-VERSION = "0.2.10"
+VERSION = "0.2.11"

permafrost/backends.py

@@ -5,15 +5,19 @@
 
 class GroupSiteModelBackendMixin():
 
-    def _get_group_permissions(self, user_obj):
+    def _get_group_permissions(self, user_obj, obj=None, site=None):
         '''
         Adds the SiteID for filtering Groups
         '''
-        current_site = Site.objects.get_current()
+        if site:
+            current_site = site
+        else:
+            current_site = Site.objects.get_current()
+    
         user_groups_field = get_user_model()._meta.get_field('groups')
         user_groups_query = 'group__%s' % user_groups_field.related_query_name()
 
-        return Permission.objects.filter(**{user_groups_query: user_obj}).filter(group__permafrost_role__site=current_site)                   # TODO: Should it return Groups that do not have a Permafrost Role also?
+        return Permission.objects.filter(**{user_groups_query: user_obj}, group__permafrost_role__site=current_site)                   # TODO: Should it return Groups that do not have a Permafrost Role also?
 
 
 class PermafrostModelBackend(GroupSiteModelBackendMixin, ModelBackend):

permafrost/templates/permafrost/permafrostrole_manage.html

@@ -5,7 +5,7 @@
 
 {% block content %}
 
-<h1 class="my-3 text-gray-800">{% trans 'Roles & Permissions' %}</h1></a>
+<h1 class="my-3 text-gray-800">{% trans 'Roles & Permissions' %}</h1>
 
 <div class="row no-gutters shadow bg-white vh-main">
     <div class="col-3 d-flex flex-column flex-shrink-0 h-100 px-2 border-right-gray-300">