Skip to content

Commit

Permalink
docs: small improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
ergo committed Nov 21, 2016
1 parent 9e6ea69 commit 873d2c7
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 3 deletions.
7 changes: 7 additions & 0 deletions ziggurat_foundations/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@


def groupfinder(userid, request):
"""
Default groupfinder implementaion for pyramid applications
:param userid:
:param request:
:return:
"""
if userid and hasattr(request, 'user') and request.user:
groups = ['group:%s' % g.id for g in request.user.groups]
return groups
Expand Down
5 changes: 5 additions & 0 deletions ziggurat_foundations/models/external_identity.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@


class ExternalIdentityMixin(BaseModel):
"""
Mixin for External Identity model - it represents oAuth(or other) accounts
attached to your user object
"""

__table_args__ = (
sa.PrimaryKeyConstraint('external_id', 'local_user_id', 'provider_name',
name='pk_external_identities'),
Expand Down
2 changes: 1 addition & 1 deletion ziggurat_foundations/models/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


class GroupMixin(BaseModel):
""" base mixin for group object"""
""" Mixin for Group model """

_ziggurat_services = [GroupService]

Expand Down
2 changes: 1 addition & 1 deletion ziggurat_foundations/models/group_permission.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class GroupPermissionMixin(BaseModel):
""" group permission mixin """
""" Mixin for GroupPermission model"""

__table_args__ = (sa.PrimaryKeyConstraint('group_id', 'perm_name',
name='pk_groups_permissions'),
Expand Down
4 changes: 4 additions & 0 deletions ziggurat_foundations/models/group_resource_permission.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@


class GroupResourcePermissionMixin(BaseModel):
"""
Mixin for GroupResourcePermission model
"""

__table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}

@declared_attr
Expand Down
4 changes: 4 additions & 0 deletions ziggurat_foundations/models/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@


class ResourceMixin(BaseModel):
"""
Mixin for Resource model
"""

__possible_permissions__ = ()

_ziggurat_services = [ResourceService, ResourceTreeService]
Expand Down
2 changes: 1 addition & 1 deletion ziggurat_foundations/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


class UserMixin(BaseModel):
""" Base mixin for user object representation.
""" Base mixin for User object representation.
It supplies all the basic functionality from password hash generation
and matching to utility methods used for querying database for users
and their permissions or resources they have access to. It is meant
Expand Down
3 changes: 3 additions & 0 deletions ziggurat_foundations/models/user_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@


class UserGroupMixin(BaseModel):
"""
Mixin for UserGroup model
"""
__table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}

@declared_attr
Expand Down
3 changes: 3 additions & 0 deletions ziggurat_foundations/models/user_permission.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@


class UserPermissionMixin(BaseModel):
"""
Mixin for UserPermission model
"""
__table_args__ = (sa.PrimaryKeyConstraint('user_id', 'perm_name',
name='pk_users_permissions'),
{'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
Expand Down
3 changes: 3 additions & 0 deletions ziggurat_foundations/models/user_resource_permission.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@


class UserResourcePermissionMixin(BaseModel):
"""
Mixin for UserResourcePermission model
"""
__table_args__ = (sa.PrimaryKeyConstraint(
'user_id', 'resource_id', 'perm_name',
name='pk_users_resources_permissions '),
Expand Down

0 comments on commit 873d2c7

Please sign in to comment.