diff --git a/jasset/views.py b/jasset/views.py index 3d1db5bfe..37d4864e7 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -420,7 +420,7 @@ def list_idc(request): if keyword: posts = IDC.objects.filter(Q(name__contains=keyword) | Q(comment__contains=keyword)) else: - posts = IDC.objects.all().order_by('id') + posts = IDC.objects.exclude(name='ALL').order_by('id') contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) return render_to_response('jasset/idc_list.html', locals(), context_instance=RequestContext(request)) diff --git a/jumpserver/urls.py b/jumpserver/urls.py index 2d3c8ff2c..9d78b0928 100644 --- a/jumpserver/urls.py +++ b/jumpserver/urls.py @@ -1,12 +1,9 @@ from django.conf.urls import patterns, include, url -from views import index urlpatterns = patterns('', # Examples: - # url(r'^$', 'jumpserver.views.home', name='home'), - # url(r'^blog/', include('blog.urls')), - (r'^$', index), + (r'^$', 'jumpserver.views.index'), (r'^api/user/$', 'jumpserver.api.api_user'), (r'^skin_config/$', 'jumpserver.views.skin_config'), (r'^install/$', 'jumpserver.views.install'), diff --git a/jumpserver/views.py b/jumpserver/views.py index e2c629676..8da427f19 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -65,15 +65,11 @@ def index_cu(request): return render_to_response('index_cu.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): + 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) @@ -196,9 +192,6 @@ def index(request): return render_to_response('index.html', locals(), context_instance=RequestContext(request)) - - - def skin_config(request): return render_to_response('skin_config.html') diff --git a/templates/jasset/host_add.html b/templates/jasset/host_add.html index b5ccddfa5..8a5bad5df 100644 --- a/templates/jasset/host_add.html +++ b/templates/jasset/host_add.html @@ -184,40 +184,22 @@ $('#assetForm').validator({ msg: {required: "必须填写!"} }, "j_group": { - rule: "checked", - tip: "选择业务组", + rule: "required", + tip: "选择主机组", ok: "", msg: {checked: "至少选择一个组"} }, - "j_usergroup": { - rule: "checked", - tip: "选择用户组", + "j_idc": { + rule: "required", + tip: "选择IDC", ok: "", - msg: {checked: "至少选择一个组"} + msg: {checked: "必须填写!"} }, - "j_user": { - rule: "required(type_m)", - tip: "普通用户名", + "j_dept": { + rule: "required", + tip: "选择部门", ok: "", - msg: {required: "请填写用户名"} - }, - "j_password": { - rule: "required(type_m);length[6~16]", - tip: "密码6-16位", - ok: "", - msg: {required: "6-16位"} - }, - "j_root": { - rule: "required(type_m)", - tip: "超管用户名", - ok: "", - msg: {required: "请填写用户名"} - }, - "j_passwd": { - rule: "required(type_m);length[6~16]", - tip: "密码6-16位", - ok: "", - msg: {required: "6-16位"} + msg: {checked: "至少选择一个部门"} } }, valid: function(form) { diff --git a/templates/jasset/idc_add.html b/templates/jasset/idc_add.html index f77705c2e..a02f9eb47 100644 --- a/templates/jasset/idc_add.html +++ b/templates/jasset/idc_add.html @@ -34,7 +34,7 @@
{{ smg }}
{% endif %}
-
+