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

Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei

Browse Source 
Conflicts:
	jperm/views.py
	jumpserver/views.py
This commit is contained in:
guanghongwei
2015-02-28 21:26:23 +08:00
parent f0cd064195 56f8f5d09b
commit 9bab7bf1e7
7 changed files with 336 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jperm/views.py
View File

@@ -8,7 +8,7 @@ from jasset.models import Asset, BisGroup
from jperm.models import Perm, SudoPerm, CmdGroup
from django.core.paginator import Paginator, EmptyPage, InvalidPage
from django.db.models import Q
from jumpserver.views import LDAP_ENABLE, ldap_conn, CONF, perm_user_asset
from jumpserver.views import LDAP_ENABLE, ldap_conn, CONF, perm_user_asset, page_list_return
if LDAP_ENABLE:
@@ -40,19 +40,18 @@ def perm_list(request):
groups = contact_list = Perm.objects.all()
users = contact_list2 = User.objects.all().order_by('id')
p = paginator = Paginator(contact_list, 10)
p2 = paginator2 = Paginator(contact_list2, 10)
try:
page = int(request.GET.get('page', '1'))
current_page = int(request.GET.get('page', '1'))
except ValueError:
page = 1
current_page = 1
page_range = page_list_return(len(p.page_range), current_page)
try:
contacts = paginator.page(page)
contacts2 = paginator2.page(page)
contacts = paginator.page(current_page)
except (EmptyPage, InvalidPage):
contacts = paginator.page(paginator.num_pages)
contacts2 = paginator2.page(paginator2.num_pages)
return render_to_response('jperm/perm_list.html', locals(), context_instance=RequestContext(request))
return render_to_response('jperm/perm_list.html', locals())
def user_asset_cmd_groups_get(user_groups_select='', asset_groups_select='', cmd_groups_select=''):