7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-08-08 15:50:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

/acl/resources add param resource_type_id

Browse Source
This commit is contained in:
pycook
2019-11-24 22:33:57 +08:00
parent 3b7cc4595b
commit ba80ec4403
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/lib/perm/acl/resource.py
View File

@@ -137,13 +137,16 @@ class ResourceGroupCRUD(object):
class ResourceCRUD(object):
@staticmethod
def search(q, app_id, page=1, page_size=None):
def search(q, app_id, resource_type_id=None, page=1, page_size=None):
query = db.session.query(Resource).filter(
Resource.deleted.is_(False)).filter(Resource.app_id == app_id)
if q:
query = query.filter(Resource.name.ilike("%{0}%".format(q)))
if resource_type_id:
query = query.filter(Resource.resource_type_id == resource_type_id)
numfound = query.count()
return numfound, query.offset((page - 1) * page_size).limit(page_size)