github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 08:19:04 +00:00
Code Issues Projects Releases Wiki Activity

bugs

Browse Source
This commit is contained in:
halcyon
2015-04-14 17:25:56 +08:00
parent 4abf25ef13
commit 3bfe0e3c16
13 changed files with 169 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jperm/views.py
View File

@@ -722,7 +722,7 @@ def get_apply_posts(request, status, username, dept_name, keyword=None):
posts = Apply.objects.filter(Q(applyer__contains=keyword) | Q(approver__contains=keyword)) \
.filter(status=status).filter(dept=dept_name).order_by('-date_add')
else:
posts = Log.objects.filter(status=status).filter(dept=dept_name).order_by('-date_add')
posts = Apply.objects.filter(status=status).filter(dept=dept_name).order_by('-date_add')
elif is_common_user(request):
if keyword: