Skip to content

aa.gusti / opensipkd-base

Go to a project
Commit 22dba5a5 by aa.gusti
Options

user departemen

1 parent 69d47632
Inline Side-by-side
Showing 1 changed file with 0 additions and 8 deletions
opensipkd/models/user_area.py
...@@ -17,18 +17,10 @@ class UserArea(DefaultModel, Base): ...@@ -17,18 +17,10 @@ class UserArea(DefaultModel, Base):
@classmethod @classmethod
def allow_area(cls, user_id, desa_id=None, desa_kd=None, def allow_area(cls, user_id, desa_id=None, desa_kd=None,
group_names=("Superuser", "pbbm-admin"), ): group_names=("Superuser", "pbbm-admin"), ):
<<<<<<< HEAD
user = UserGroup.query().filter_by(user_id = user_id).outerjoin(
Group, Group.id == UserGroup.group_id).filter(
Group.group_name._in(*group_names)).first()
if user and user.id:
=======
user = UserGroup.query().filter(user_id == user_id).outerjoin( user = UserGroup.query().filter(user_id == user_id).outerjoin(
Group, Group.id == UserGroup.group_id).filter( Group, Group.id == UserGroup.group_id).filter(
Group.group_name.in_(group_names)).first() Group.group_name.in_(group_names)).first()
if user and user.user_id: if user and user.user_id:
>>>>>>> 0f2bd50199cb24a1f7080c0f664126a56f675ea9
return True return True
if not desa_id and not desa_kd: if not desa_id and not desa_kd:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!