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

/acl/resources add param resource_type_id

This commit is contained in:
pycook 2019-11-24 22:33:57 +08:00
parent 2210e9715b
commit 47cfce7ee9
2 changed files with 6 additions and 2 deletions
Show Stats 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): class ResourceCRUD(object):
@staticmethod @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( query = db.session.query(Resource).filter(
Resource.deleted.is_(False)).filter(Resource.app_id == app_id) Resource.deleted.is_(False)).filter(Resource.app_id == app_id)
if q: if q:
query = query.filter(Resource.name.ilike("%{0}%".format(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() numfound = query.count()
return numfound, query.offset((page - 1) * page_size).limit(page_size) return numfound, query.offset((page - 1) * page_size).limit(page_size)

3
api/views/acl/resources.py
View File

@ -72,9 +72,10 @@ class ResourceView(APIView):
page = get_page(request.values.get("page", 1)) page = get_page(request.values.get("page", 1))
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')
resource_type_id = request.values.get('resource_type_id')
app_id = request.values.get('app_id') app_id = request.values.get('app_id')
numfound, res = ResourceCRUD.search(q, app_id, page, page_size) numfound, res = ResourceCRUD.search(q, app_id, resource_type_id, page, page_size)
return self.jsonify(numfound=numfound, return self.jsonify(numfound=numfound,
page=page, page=page,