From e1b9134d7f9c8e42e5c680fd6abbde97314c49c6 Mon Sep 17 00:00:00 2001 From: halcyon <864072399@qq.com> Date: Wed, 1 Apr 2015 18:58:10 +0800 Subject: [PATCH] 0402 --- jperm/models.py | 1 + jperm/urls.py | 2 +- jperm/views.py | 78 +++++++++++++++------- jumpserver.conf | 6 ++ jumpserver/settings.py | 7 ++ jumpserver/templatetags/mytags.py | 6 ++ templates/jperm/perm_log_offline.html | 96 +++++++++++++++++++++++++++ templates/jperm/perm_log_online.html | 93 ++++++++++++++++++++++++++ templates/nav.html | 4 +- 9 files changed, 266 insertions(+), 27 deletions(-) create mode 100644 templates/jperm/perm_log_offline.html create mode 100644 templates/jperm/perm_log_online.html diff --git a/jperm/models.py b/jperm/models.py index 6cfcceb76..a865d005a 100644 --- a/jperm/models.py +++ b/jperm/models.py @@ -42,6 +42,7 @@ class Apply(models.Model): bisgroup = models.CharField(max_length=500) asset = models.CharField(max_length=500) comment = models.TextField(blank=True, null=True) + status = models.IntegerField(max_length=2) date_add = models.DateTimeField(default=datetime.datetime.now(), null=True) date_end = models.DateTimeField(null=True) diff --git a/jperm/urls.py b/jperm/urls.py index 9a840afe4..c15807260 100644 --- a/jperm/urls.py +++ b/jperm/urls.py @@ -25,5 +25,5 @@ urlpatterns = patterns('jperm.views', (r'^cmd_del/$', 'cmd_del'), (r'^cmd_edit/$', 'cmd_edit'), (r'^apply/$', 'perm_apply'), - (r'^apply/online/$', 'perm_apply_log'), + (r'^apply_show/(\w+)/$', 'perm_apply_log'), ) diff --git a/jperm/views.py b/jperm/views.py index 0308af278..e91c8b670 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -1,5 +1,10 @@ # coding: utf-8 +import ast +import datetime + + +from django.core.mail import send_mail from django.shortcuts import render_to_response from django.http import HttpResponseRedirect, HttpResponse from django.template import RequestContext @@ -537,6 +542,7 @@ def perm_apply(request): dept = DEPT.objects.get(id=dept_id) posts = Asset.objects.filter(dept=dept) egroup = dept.bisgroup_set.all() + mail_address = 'wangyong@fun.tv' if request.method == 'POST': applyer = request.POST.get('applyer') @@ -544,41 +550,65 @@ def perm_apply(request): group = request.POST.getlist('group') hosts = request.POST.getlist('hosts') comment = request.POST.get('comment') - - Apply.objects.create(applyer=applyer, dept=dept, bisgroup=group, asset=hosts, comment=comment) print applyer, dept, group, hosts, comment + url = 'http://127.0.0.1:8000/jperm/apply/exec/?id=' + mail_title = '权限申请' + mail_msg = """ + Hi,%s: + 有新的权限申请, 详情如下: + 申请人: %s + 申请主机组: %s + 申请的主机: %s + 申请时间: %s + 申请说明: %s + 请及时审批, 审批完成后点击以下链接,告知各位。 + %s + """ % (u'123', applyer, group, hosts, datetime.datetime.now(), comment, url) + send_mail(mail_title, mail_msg, 'jkfunshion@fun.tv', [mail_address], fail_silently=False) + smg = "提交成功,已转交运维上线。" + + Apply.objects.create(applyer=applyer, dept=dept, bisgroup=group, asset=hosts, status=0, comment=comment) return render_to_response('jperm/perm_apply.html', locals(), context_instance=RequestContext(request)) return render_to_response('jperm/perm_apply.html', locals(), context_instance=RequestContext(request)) -def perm_apply_log(request): +def get_apply_posts(request, status, username, dept_name, keyword=None): + if is_super_user(request): + if keyword: + posts = Apply.objects.filter(Q(applyer__contains=keyword) | Q(approver__contains=keyword)) \ + .filter(status=status).order_by('-date_add') + else: + posts = Apply.objects.filter(status=status).order_by('-date_add') + + elif is_group_admin(request): + if keyword: + 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') + + elif is_common_user(request): + if keyword: + posts = Apply.objects.filter(applyer=username).filter(status=status).filter(Q(applyer__contains=keyword) | + Q(asset__contains=keyword)).order_by('-date_add') + else: + posts = Apply.objects.filter(applyer=username).filter(status=status).order_by('-date_add') + return posts + + +def perm_apply_log(request, offset): header_title, path1, path2 = u'权限申请记录', u'权限管理', u'申请记录' keyword = request.GET.get('keyword') dept_id = get_user_dept(request) dept_name = DEPT.objects.get(id=dept_id).name user_id = request.session.get('user_id') username = User.objects.get(id=user_id).username - if is_super_user(request): - if keyword: - posts = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \ - .filter(is_finished=1).order_by('-start_time') - else: - posts = Log.objects.filter(is_finished=1).order_by('-start_time') + if offset == 'online': + posts = get_apply_posts(request, 0, username, dept_name, keyword) contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) + return render_to_response('jperm/perm_log_online.html', locals(), context_instance=RequestContext(request)) - elif is_group_admin(request): - if keyword: - posts = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \ - .filter(is_finished=1).filter(dept_name=dept_name).order_by('-start_time') - else: - posts = Log.objects.filter(is_finished=1).filter(dept_name=dept_name).order_by('-start_time') + elif offset == 'offline': + posts = get_apply_posts(request, 1, username, dept_name, keyword) contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) - - elif is_common_user(request): - if keyword: - posts = Apply.objects.filter(applyer=username).filter(Q(applyer__contains=keyword) | Q(asset__contains=keyword))\ - .order_by('-date_add') - else: - posts = Apply.objects.filter(applyer=username).order_by('-date_add') - contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) - return render_to_response('jperm/perm_log.html', locals(), context_instance=RequestContext(request)) + return render_to_response('jperm/perm_log_offline.html', locals(), context_instance=RequestContext(request)) diff --git a/jumpserver.conf b/jumpserver.conf index 8de09fc8b..95250fbea 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -20,3 +20,9 @@ web_socket_host = 127.0.0.1:3000 [web] key = 88aaaf7ffe3c6c04 +[mail] +email_host = 'mail.funshion.com' +email_port = '25' +email_host_user = 'jkfunshion' +email_host_password = 'jkmail%' +email_use_tls = False \ No newline at end of file diff --git a/jumpserver/settings.py b/jumpserver/settings.py index 489577dc1..db905dfde 100644 --- a/jumpserver/settings.py +++ b/jumpserver/settings.py @@ -121,3 +121,10 @@ USE_TZ = False STATIC_URL = '/static/' +# mail config +EMAIL_HOST = config.get('mail', 'email_host') +EMAIL_PORT = config.get('mail', 'email_port') +EMAIL_HOST_USER = config.get('mail', 'email_host_user') +EMAIL_HOST_PASSWORD = config.get('mail', 'email_host_password') +EMAIL_USE_TLS = config.get('mail', 'email_use_tls') + diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index 1f264f4e4..b414dfc3d 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -1,6 +1,7 @@ # coding: utf-8 import re +import ast import time from django import template @@ -160,6 +161,11 @@ def group_type_to_str(type_name): return group_types.get(type_name) +@register.filter(name='ast_to_list') +def ast_to_list(lis): + return ast.literal_eval(lis) + + # @register.filter(name='perm_asset_count') # def perm_asset_count(user_id): # return len(perm_user_asset(user_id)) diff --git a/templates/jperm/perm_log_offline.html b/templates/jperm/perm_log_offline.html new file mode 100644 index 000000000..6839d32ab --- /dev/null +++ b/templates/jperm/perm_log_offline.html @@ -0,0 +1,96 @@ +{% extends 'base.html' %} +{% load mytags %} +{% block content %} +{% include 'nav_cat_bar.html' %} +
+
+
+
+
+
用户权限申请详细信息列表
+
+ + + + + + + + + + +
+
+ +
+
+ +
+
+
+ + + + + + + + + + + + + + + + {% for post in contacts.object_list %} + + + + + + + + + + + + + + {% endfor %} + +
申请人 所属部门 申请主机组 申请主机 批准人 申请时间 批准时间 备注
{{ post.applyer }} {{ post.dept }} {% for i in post.bisgroup|ast_to_list %} {{ i }} {% endfor %} {% for i in post.asset|ast_to_list %} {{ i }} {% endfor %} {{ post.approver }} {{ post.date_add|date:"Y-m-d H:i:s"}} {{ post.date_end|date:"Y-m-d H:i:s" }} {{ post.comment }}
+
+
+
+ {% include 'paginator.html' %} +
+
+
+
+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/templates/jperm/perm_log_online.html b/templates/jperm/perm_log_online.html new file mode 100644 index 000000000..cae9b204e --- /dev/null +++ b/templates/jperm/perm_log_online.html @@ -0,0 +1,93 @@ +{% extends 'base.html' %} +{% block content %} +{% include 'nav_cat_bar.html' %} +
+
+
+
+
+
用户权限申请详细信息列表
+
+ + + + + + + + + + +
+
+ +
+
+ +
+
+
+ + + + + + + + + + + + + + + {% for post in contacts.object_list %} + + + + + + + + + + + + + {% endfor %} + +
申请人 所属部门 申请主机组 申请主机 申请时间 批准时间 备注
{{ post.applyer }} {{ post.dept }} {{ post.bisgroup }} {{ post.asset }} {{ post.date_add|date:"Y-m-d H:i:s"}} {{ post.date_end|date:"Y-m-d H:i:s" }} {{ post.comment }}
+
+
+
+ {% include 'paginator.html' %} +
+
+
+
+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/templates/nav.html b/templates/nav.html index 93cb66523..745c07d5e 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -143,8 +143,8 @@
  • 权限申请