mirror of https://github.com/veops/cmdb.git
fix(api): search for attr filter
This commit is contained in:
parent
b669775cd6
commit
89db5a060e
|
@ -6,6 +6,7 @@ from __future__ import unicode_literals
|
||||||
import copy
|
import copy
|
||||||
import six
|
import six
|
||||||
import time
|
import time
|
||||||
|
from flask import abort
|
||||||
from flask import current_app
|
from flask import current_app
|
||||||
from flask_login import current_user
|
from flask_login import current_user
|
||||||
from jinja2 import Template
|
from jinja2 import Template
|
||||||
|
@ -152,7 +153,9 @@ class Search(object):
|
||||||
if not self.fl:
|
if not self.fl:
|
||||||
self.fl = set(self.type2filter_perms[ci_type.id]['attr_filter'])
|
self.fl = set(self.type2filter_perms[ci_type.id]['attr_filter'])
|
||||||
else:
|
else:
|
||||||
self.fl = set(self.fl) & set(self.type2filter_perms[ci_type.id]['attr_filter'])
|
fl = set(self.fl) & set(self.type2filter_perms[ci_type.id]['attr_filter'])
|
||||||
|
not fl and abort(400, ErrFormat.ci_filter_perm_attr_no_permission.format(self.fl))
|
||||||
|
self.fl = fl
|
||||||
else:
|
else:
|
||||||
self.fl = self.fl or {}
|
self.fl = self.fl or {}
|
||||||
if not self.fl or isinstance(self.fl, dict):
|
if not self.fl or isinstance(self.fl, dict):
|
||||||
|
|
Loading…
Reference in New Issue