7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from kdyq007/master 

[更新] 新增角色、资源、权限页面
This commit is contained in:
pycook 2019-11-24 17:29:58 +08:00 committed by GitHub
parent 39aaa916dc 0151e0ff56
commit 2210e9715b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/models/acl.py
View File

@ -74,7 +74,7 @@ class UserQuery(BaseQuery):
class User(CRUDModel, SoftDeleteMixin): class User(CRUDModel, SoftDeleteMixin):
__tablename__ = 'users' __tablename__ = 'users'
__bind_key__ = "user" # __bind_key__ = "user"
query_class = UserQuery query_class = UserQuery
uid = db.Column(db.Integer, primary_key=True, autoincrement=True) uid = db.Column(db.Integer, primary_key=True, autoincrement=True)

1
api/views/acl/user.py
View File

@ -33,7 +33,6 @@ class UserView(APIView):
page_size = get_page_size(request.values.get('page_size')) page_size = get_page_size(request.values.get('page_size'))
q = request.values.get("q") q = request.values.get("q")
numfound, users = UserCRUD.search(q, page, page_size) numfound, users = UserCRUD.search(q, page, page_size)
id2parents = RoleRelationCRUD.get_parents(uids=[i.uid for i in users]) id2parents = RoleRelationCRUD.get_parents(uids=[i.uid for i in users])
users = [i.to_dict() for i in users] users = [i.to_dict() for i in users]