Skip to content

Commit

Permalink
correct the MRO order in CRUD forms and testing models
Browse files Browse the repository at this point in the history
fixes #64
  • Loading branch information
guruofgentoo committed Jun 7, 2019
1 parent cae02a2 commit 2f4c451
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions keg_auth/forms.py
Expand Up @@ -114,7 +114,7 @@ def html_link(obj):
flask.url_for(endpoint, objid=obj.id)
)

class User(ModelForm, PermissionsMixin, BundlesMixin):
class User(PermissionsMixin, BundlesMixin, ModelForm):
class Meta:
model = user_cls
only = _fields
Expand Down Expand Up @@ -175,7 +175,7 @@ def html_link(obj):
import flask
return link_to(obj.name, flask.url_for(endpoint, objid=obj.id))

class Group(ModelForm, PermissionsMixin, BundlesMixin):
class Group(PermissionsMixin, BundlesMixin, ModelForm):
class Meta:
model = group_cls

Expand Down Expand Up @@ -203,7 +203,7 @@ def html_link(obj):
import flask
return link_to(obj.name, flask.url_for(endpoint, objid=obj.id))

class Bundle(ModelForm, PermissionsMixin):
class Bundle(PermissionsMixin, ModelForm):
class Meta:
model = bundle_cls

Expand Down
12 changes: 6 additions & 6 deletions keg_auth_ta/model/entities.py
Expand Up @@ -14,31 +14,31 @@ class EntityMixin(DefaultColsMixin, MethodsMixin):


@auth_entity_registry.register_user
class User(db.Model, keg_auth.UserEmailMixin, keg_auth.UserMixin, EntityMixin):
class User(keg_auth.UserEmailMixin, keg_auth.UserMixin, EntityMixin, db.Model):
__tablename__ = 'users'


class UserNoEmail(db.Model, keg_auth.UserMixin, EntityMixin):
class UserNoEmail(keg_auth.UserMixin, EntityMixin, db.Model):
__tablename__ = 'users_no_email'


class UserWithToken(EntityMixin, keg_auth.UserEmailMixin, keg_auth.UserTokenMixin, db.Model):
class UserWithToken(keg_auth.UserEmailMixin, keg_auth.UserTokenMixin, EntityMixin, db.Model):
__tablename__ = 'users_with_token'


@auth_entity_registry.register_permission
class Permission(db.Model, keg_auth.PermissionMixin, EntityMixin):
class Permission(keg_auth.PermissionMixin, EntityMixin, db.Model):
__tablename__ = 'permissions'

def __repr__(self):
return '<Permission id={} token={}>'.format(self.id, self.token)


@auth_entity_registry.register_bundle
class Bundle(db.Model, keg_auth.BundleMixin, EntityMixin):
class Bundle(keg_auth.BundleMixin, EntityMixin, db.Model):
__tablename__ = 'bundles'


@auth_entity_registry.register_group
class Group(db.Model, keg_auth.GroupMixin, EntityMixin):
class Group(keg_auth.GroupMixin, EntityMixin, db.Model):
__tablename__ = 'groups'

0 comments on commit 2f4c451

Please sign in to comment.