޸ҳ

jumpserver.conf

@@ -9,7 +9,7 @@ database = jumpserver
 
 [ldap]
 ldap_enable = 1
-host_url = ldap://192.168.8.230:389
+host_url = ldap://127.0.0.1:389
 base_dn = dc=jumpserver, dc=org
 root_dn = cn=admin,dc=jumpserver,dc=org
 root_pw = secret234

jumpserver/urls.py

 from django.conf.urls import patterns, include, url
-from api import view_splitter
-from views import index, admin_index
+from views import index
 
 
 urlpatterns = patterns('',
     # Examples:
     # url(r'^$', 'jumpserver.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
-    (r'^$', view_splitter, {'su': index, 'adm': admin_index}),
+    (r'^$', index),
     (r'^api/user/$', 'jumpserver.api.api_user'),
     (r'^skin_config/$', 'jumpserver.views.skin_config'),
     (r'^install/$', 'jumpserver.views.install'),

jumpserver/views.py

@@ -2,13 +2,9 @@
 
 from __future__ import division
 
-import datetime
-
 from django.db.models import Count
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from jasset.models import IDC
-from juser.models import DEPT
 from jperm.models import Apply
 from jumpserver.api import *
 
@@ -69,18 +65,19 @@ def index_cu(request):
     return render_to_response('index_cu.html', locals(), context_instance=RequestContext(request))
 
 
-@require_login
-@require_super_user
-def index(request):
-    if request.session.get('role_id') == 0:
-        return index_cu(request)
-    users = User.objects.all()
-    hosts = Asset.objects.all()
-    online = Log.objects.filter(is_finished=0)
+@require_admin
+def admin_index(request):
+    user_id = request.session.get('user_id', '')
+    user = User.objects.get(id=user_id)
+    dept = user.dept
+    dept_name = user.dept.name
+    users = User.objects.filter(dept=dept)
+    hosts = Asset.objects.filter(dept=dept)
+    online = Log.objects.filter(dept_name=dept_name, is_finished=0)
     online_host = online.values('host').distinct()
     online_user = online.values('user').distinct()
-    active_users = User.objects.filter(is_active=1)
-    active_hosts = Asset.objects.filter(is_active=1)
+    active_users = users.filter(is_active=1)
+    active_hosts = hosts.filter(is_active=1)
 
     # percent of dashboard
     percent_user = format(active_users.count() / users.count(), '.0%')
@@ -91,7 +88,7 @@ def index(request):
     li_date, li_str = getDaysByNum(7)
     today = datetime.datetime.now().day
     from_week = datetime.datetime.now() - datetime.timedelta(days=7)
-    week_data = Log.objects.filter(start_time__range=[from_week, datetime.datetime.now()])
+    week_data = Log.objects.filter(dept_name=dept_name, start_time__range=[from_week, datetime.datetime.now()])
     user_top_ten = week_data.values('user').annotate(times=Count('user')).order_by('-times')[:10]
     host_top_ten = week_data.values('host').annotate(times=Count('host')).order_by('-times')[:10]
     user_dic, host_dic = get_data(week_data, user_top_ten, 'user'), get_data(week_data, host_top_ten, 'host')
@@ -131,19 +128,21 @@ def index(request):
     return render_to_response('index.html', locals(), context_instance=RequestContext(request))
 
 
-@require_admin
-def admin_index(request):
-    user_id = request.session.get('user_id', '')
-    user = User.objects.get(id=user_id)
-    dept = user.dept
-    dept_name = user.dept.name
-    users = User.objects.filter(dept=dept)
-    hosts = Asset.objects.filter(dept=dept)
-    online = Log.objects.filter(dept_name=dept_name, is_finished=0)
+@require_login
+def index(request):
+    if is_common_user(request):
+        return index_cu(request)
+
+    if is_group_admin(request):
+        return admin_index(request)
+
+    users = User.objects.all()
+    hosts = Asset.objects.all()
+    online = Log.objects.filter(is_finished=0)
     online_host = online.values('host').distinct()
     online_user = online.values('user').distinct()
-    active_users = users.filter(is_active=1)
-    active_hosts = hosts.filter(is_active=1)
+    active_users = User.objects.filter(is_active=1)
+    active_hosts = Asset.objects.filter(is_active=1)
 
     # percent of dashboard
     percent_user = format(active_users.count() / users.count(), '.0%')
@@ -154,7 +153,7 @@ def admin_index(request):
     li_date, li_str = getDaysByNum(7)
     today = datetime.datetime.now().day
     from_week = datetime.datetime.now() - datetime.timedelta(days=7)
-    week_data = Log.objects.filter(dept_name=dept_name, start_time__range=[from_week, datetime.datetime.now()])
+    week_data = Log.objects.filter(start_time__range=[from_week, datetime.datetime.now()])
     user_top_ten = week_data.values('user').annotate(times=Count('user')).order_by('-times')[:10]
     host_top_ten = week_data.values('host').annotate(times=Count('host')).order_by('-times')[:10]
     user_dic, host_dic = get_data(week_data, user_top_ten, 'user'), get_data(week_data, host_top_ten, 'host')
@@ -194,6 +193,9 @@ def admin_index(request):
     return render_to_response('index.html', locals(), context_instance=RequestContext(request))
 
 
+
+
+
 def skin_config(request):
     return render_to_response('skin_config.html')