Commit aefd9d12 by Ari Agung Prasetiyo Committed by Ari Agung Prasetiyo

penyesuaian allow_area

1 parent c2adf1ec
......@@ -17,10 +17,10 @@ class UserArea(DefaultModel, Base):
@classmethod
def allow_area(cls, user_id, desa_id=None, desa_kd=None,
group_names=("Superuser", "pbbm-admin"), ):
user = UserGroup.query().filter_by(user_id == user_id).outerjoin(
user = UserGroup.query().filter(user_id == user_id).outerjoin(
Group, Group.id == UserGroup.group_id).filter(
UserGroup.group_name._in(*group_names)).first()
if user and user.id:
Group.group_name.in_(group_names)).first()
if user and user.user_id:
return True
if desa_id:
......
......@@ -34,6 +34,10 @@ class UserGroup(UserGroupMixin, Base, CommonModel):
@classmethod
def _get_by_user(cls, user):
return DBSession.query(cls).filter_by(user_id=user.id).all()
@classmethod
def query(cls):
return DBSession.query(cls)
@classmethod
def get_by_user(cls, user):
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!