* [Update] 修改一些内容

* [Update] 修改datatable 支持process

* [Bugfix] 修复asset queryset 没有valid方法的bug
This commit is contained in:
老广
2018-07-25 02:05:28 -05:00
committed by GitHub
parent e7c530d8e6
commit 36f1165d1b
10 changed files with 54 additions and 61 deletions

View File

@@ -23,10 +23,10 @@ __all__ = [
class OrgManager(models.Manager):
def get_queryset(self):
queryset = super(OrgManager, self).get_queryset()
kwargs = {}
if not hasattr(tl, 'times'):
tl.times = 0
print("[{}]>>>>>>>>>> Get query set".format(tl.times))
print(current_org)
if not current_org:
@@ -34,11 +34,8 @@ class OrgManager(models.Manager):
elif current_org.is_real():
kwargs['org_id'] = current_org.id
elif current_org.is_default():
kwargs['org_id'] = None
queryset = super(OrgManager, self).get_queryset()
queryset = queryset.filter(org_id="").filter(org_id__isnull=True)
queryset = queryset.filter(**kwargs)
# print(kwargs)
# print(queryset.query)
tl.times += 1
return queryset