diff --git a/muk_security/__manifest__.py b/muk_security/__manifest__.py index 36c5cd2..f08205b 100644 --- a/muk_security/__manifest__.py +++ b/muk_security/__manifest__.py @@ -20,7 +20,7 @@ { "name": "MuK Security", "summary": """Security Features""", - "version": "12.0.1.2.3", + "version": "12.0.1.2.4", "category": "Extra Tools", "license": "AGPL-3", "website": "http://www.mukit.at", diff --git a/muk_security/models/mixins_access_groups.py b/muk_security/models/mixins_access_groups.py index 7713880..5d02030 100644 --- a/muk_security/models/mixins_access_groups.py +++ b/muk_security/models/mixins_access_groups.py @@ -104,7 +104,7 @@ class AccessGroupsModel(models.AbstractModel): WHERE r.aid = "{table}".id {groups_mode} ) ''' - groups_mode = self._access_groups_mode and 'AND sg.perm_{mode} = true'.format(mode=mode) + groups_mode = self._access_groups_mode and 'AND g.perm_{mode} = true'.format(mode=mode) exists_clause = exists_clause.format(table=self._table, groups_mode=groups_mode or "") where_clause = '({groups_clause} OR {exists_clause})'.format( groups_clause=where_clause, @@ -133,7 +133,7 @@ class AccessGroupsModel(models.AbstractModel): subset = self.ids and 'AND r.aid = ANY (VALUES {ids})'.format( ids=', '.join(map(lambda id: '(%s)' % id, self.ids)) ) - groups_mode = self._access_groups_mode and 'AND sg.perm_{mode} = true'.format( + groups_mode = self._access_groups_mode and 'AND g.perm_{mode} = true'.format( mode=mode ) sql_query = sql_query.format(