Merge with master

apps/assets/templates/assets/admin_user_list.html

@@ -34,7 +34,7 @@
                  <!-- Todo: Click refresh button will run a task to test admin user could connect asset or not immediately -->
                  <a href="{% url 'assets:admin-user-update' pk=admin_user.id %}" class="btn btn-xs btn-warning">{% trans 'Refresh' %}</a>
                  <a href="{% url 'assets:admin-user-update' pk=admin_user.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
-                 <a href="{% url 'assets:admin-user-delete' pk=admin_user.id %}" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
+                 <a onclick="obj_del(this,'{{ admin_user.name }}','{% url 'assets:admin-user-delete' admin_user.id %}')" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
              </td>
          </tr>
      {% endfor %}

apps/assets/templates/assets/asset_group_list.html

@@ -30,7 +30,7 @@
              <td class="text-center">{{ asset_group.comment|truncatewords:8 }}</td>
              <td class="text-center">
                  <a href="{% url 'assets:asset-group-update' pk=asset_group.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
-                 <a href="{% url 'assets:asset-group-delete' pk=asset_group.id %}" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
+                 <a onclick="obj_del(this,'{{ asset_group.name }}','{% url 'assets:asset-group-delete' asset_group.id %}')" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
              </td>
          </tr>
      {% endfor %}

apps/assets/templates/assets/idc_list.html

@@ -28,8 +28,43 @@
              <td class="text-center">{{ idc.address }}</td>
              <td class="text-center">
                  <a href="{% url 'assets:idc-update' pk=idc.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
-                 <a href="{% url 'assets:idc-delete' pk=idc.id %}" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
+                 <a onclick="obj_del(this,'{{ idc.name }}','{% url 'assets:idc-delete' idc.id %}')" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
              </td>
          </tr>
      {% endfor %}
 {% endblock %}
+{% block custom_foot_js %}
+<script>
+
+
+//删除提示样式二,可以选用。
+function obj_del2(obj,name,url){
+//alert(local);
+    top.$.jBox.confirm("您确定要删除【"+name+"】吗?", "系统提示",function (c, d, e) {
+        if (c == "ok") {
+            //loading("正在提交，请稍等...");
+          $.ajax({
+            type : "post",
+            url : url,
+            data : {
+           // idc_id : idc_id
+            },
+            success : function(data) {
+            //   alert('删除成功！')
+              $(obj).parent().parent().remove();
+            },
+            dataType : "text"
+          });
+        }
+    }, {buttonsFocus: 1,
+        draggable: false,
+        showClose: false});
+    top.$(".jbox-body .jbox-icon").css("top", "35px");
+    top.$(".jbox-button-panel").css("height", "35px");
+    return false
+}
+
+
+
+</script>
+{% endblock %}

apps/assets/templates/assets/system_user_list.html

@@ -36,7 +36,7 @@
                  <!-- Todo: Click refresh button will run a task to test admin user could connect asset or not immediately -->
                  <a href="{% url 'assets:system-user-update' pk=system_user.id %}" class="btn btn-xs btn-warning">{% trans 'Refresh' %}</a>
                  <a href="{% url 'assets:system-user-update' pk=system_user.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
-                 <a href="{% url 'assets:system-user-delete' pk=system_user.id %}" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
+                 <a onclick="obj_del(this,'{{ system_user.name }}','{% url 'assets:system-user-delete' system_user.id %}')" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
              </td>
          </tr>
      {% endfor %}

apps/assets/views.py

@@ -186,16 +186,25 @@ class IDCCreateView(AdminUserRequiredMixin, CreateView):
 
 
 class IDCUpdateView(AdminUserRequiredMixin, UpdateView):
-    pass
-
+    model = IDC
+    form_class = IDCForm
+    template_name = 'assets/idc_create.html'
+    context_object_name = 'IDC'
+    success_url = reverse_lazy('assets:idc-list')
+    def form_valid(self, form):
+        IDC = form.save(commit=False)
+        IDC.save()
+        return super(IDCUpdateView, self).form_valid(form)
 
 class IDCDetailView(AdminUserRequiredMixin, DetailView):
     pass
 
 
-class IDCDeleteView(AdminUserRequiredMixin, DeleteView):
-    pass
 
+class IDCDeleteView(AdminUserRequiredMixin, DeleteView):
+    model = IDC
+    template_name = 'assets/delete_confirm.html'
+    success_url = reverse_lazy('assets:idc-list')
 
 class AdminUserListView(AdminUserRequiredMixin, ListView):
     model = AdminUser
@@ -293,7 +302,7 @@ class AdminUserDetailView(AdminUserRequiredMixin, SingleObjectMixin, ListView):
 class AdminUserDeleteView(AdminUserRequiredMixin, DeleteView):
     model = AdminUser
     template_name = 'assets/delete_confirm.html'
-    success_url = 'assets:admin-user-list'
+    success_url = reverse_lazy('assets:admin-user-list')
 
 
 class SystemUserListView(AdminUserRequiredMixin, ListView):
@@ -384,7 +393,7 @@ class SystemUserDetailView(AdminUserRequiredMixin, DetailView):
 class SystemUserDeleteView(AdminUserRequiredMixin, DeleteView):
     model = SystemUser
     template_name = 'assets/delete_confirm.html'
-    success_url = 'assets:system-user-list'
+    success_url = reverse_lazy('assets:system-user-list')
 
 
 class SystemUserAssetView(AdminUserRequiredMixin, SingleObjectMixin, ListView):

apps/fixtures/init.json

-[{"model": "users.usergroup", "pk": 1, "fields": {"name": "Default", "comment": "Default user group for all user", "date_added": "2016-09-05T11:39:25.770Z", "created_by": "System"}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$5ReHkQOQA2Hk$DIW0b5U/uK+U0xqjA3QpYvBcODNhm2MPCm7YWbQys3I=", "last_login": null, "first_name": "", "last_name": "", "is_active": true, "date_joined": "2016-09-05T11:39:25.771Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "role": "Admin", "avatar": "", "wechat": "", "phone": "", "enable_otp": false, "secret_key_otp": "", "private_key": "", "public_key": "", "comment": "Administrator is the super user of system", "is_first_login": false, "date_expired": "2086-08-19T11:39:25.771Z", "created_by": "System", "user_permissions": [], "groups": [1]}}]
+[{"model": "users.usergroup", "pk": 1, "fields": {"name": "Default", "comment": "Default user group for all user", "date_created": "2016-09-05T11:39:25.770Z", "created_by": "System"}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$5ReHkQOQA2Hk$DIW0b5U/uK+U0xqjA3QpYvBcODNhm2MPCm7YWbQys3I=", "last_login": null, "first_name": "", "last_name": "", "is_active": true, "date_joined": "2016-09-05T11:39:25.771Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "role": "Admin", "avatar": "", "wechat": "", "phone": "", "enable_otp": false, "secret_key_otp": "", "private_key": "", "public_key": "", "comment": "Administrator is the super user of system", "is_first_login": false, "date_expired": "2086-08-19T11:39:25.771Z", "created_by": "System", "user_permissions": [], "groups": [1]}}]
\ No newline at end of file

apps/fixtures/users.json

-[{"model": "users.usergroup", "pk": 1, "fields": {"name": "Default", "comment": "Default user group for all user", "date_added": "2016-09-05T11:39:25.770Z", "created_by": "System"}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$5ReHkQOQA2Hk$DIW0b5U/uK+U0xqjA3QpYvBcODNhm2MPCm7YWbQys3I=", "last_login": null, "first_name": "", "last_name": "", "is_active": true, "date_joined": "2016-09-05T11:39:25.771Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "role": "Admin", "avatar": "", "wechat": "", "phone": "", "enable_otp": false, "secret_key_otp": "", "private_key": "", "public_key": "", "comment": "Administrator is the super user of system", "is_first_login": false, "date_expired": "2086-08-19T11:39:25.771Z", "created_by": "System", "user_permissions": [], "groups": [1]}}]
+[{"model": "users.usergroup", "pk": 1, "fields": {"name": "Default", "comment": "Default user group for all user", "date_created": "2016-09-05T11:39:25.770Z", "created_by": "System"}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$5ReHkQOQA2Hk$DIW0b5U/uK+U0xqjA3QpYvBcODNhm2MPCm7YWbQys3I=", "last_login": null, "first_name": "", "last_name": "", "is_active": true, "date_joined": "2016-09-05T11:39:25.771Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "role": "Admin", "avatar": "", "wechat": "", "phone": "", "enable_otp": false, "secret_key_otp": "", "_private_key": "", "_public_key": "", "comment": "Administrator is the super user of system", "is_first_login": false, "date_expired": "2086-08-19T11:39:25.771Z", "created_by": "System", "user_permissions": [], "groups": [1]}}]
\ No newline at end of file

apps/jumpserver/settings.py

@@ -314,3 +314,4 @@ CAPTCHA_IMAGE_SIZE = (75, 33)
 CAPTCHA_FOREGROUND_COLOR = '#001100'
 
 #
+

apps/static/jbox/Skins/jumpserver/Desktop.ini

+[.ShellClassInfo]
+IconFile=%SystemRoot%\system32\SHELL32.dll
+IconIndex=161

apps/static/jbox/Skins/jumpserver/jbox.css

+@charset "utf-8";
+/*
+  提示：CSS 样式只允许修改颜色属性，或图片的地址（图片大小要和默认的一致）。border:dotted solid double dashed
+*/
+*:focus {outline: none;}
+/* fade */
+.jbox-fade{background-color:#000000;}
+/* drag */
+.jbox-drag{border:1px dashed #003870;}
+/* jbox */
+div.jbox {padding:0px;border:none;font-size:12px;}
+/* border */
+div.jbox .jbox-border{background: none repeat scroll 0 0 #000000;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}
+/* container */
+div.jbox .jbox-container{background-color:#ffffff;border:1px solid #999999;}
+/* title-panel */
+div.jbox .jbox-title-panel{background:#2f4050;border-bottom:1px solid #CCCCCC;}
+div.jbox .jbox-title{font-weight:bold;color:#ffffff;}
+div.jbox .jbox-title-icon{background:url(images/jbox-title-icon.gif) no-repeat scroll 3px 5px transparent;}
+div.jbox .jbox-close,div.jbox .jbox-close-hover{background:url(images/jbox-close1.gif) no-repeat scroll 0px 0px transparent;}
+div.jbox .jbox-close-hover{background-position:-16px 0;}
+/* content */
+div.jbox .jbox-content{min-height:24px;line-height:18px;color:#444444;}
+div.jbox .jbox-content-loading{background-color:#E6E6E6;}
+div.jbox .jbox-content-loading-image{background:url(images/jbox-content-loading.gif) no-repeat bottom center;}
+/* button-panel */
+div.jbox .jbox-button-panel{border-top:1px solid #CCCCCC;background-color: #EEEEEE;}
+div.jbox .jbox-bottom-text{text-indent:10px;color:#444444;}
+div.jbox .jbox-button{background:url(images/jbox-button2.png) repeat-x transparent;border:#AAAAAA 1px solid;color:#888888;border-radius:3px 3px 3px 3px;margin:1px 7px 0px 0px;height:22px;cursor:default;}
+div.jbox .jbox-button-hover{background-position:0px -20px;color:#666666;}
+div.jbox .jbox-button-active{background-position:0px -40px;}
+div.jbox-warning .jbox .jbox-button-panel{background-color: #FFFFFF;}
+/* tip-color */
+div.jbox .jbox-tip-color{background-color:#003870;border-color:#003870;border-radius:3px 3px 3px 3px;color:#ffffff;}
+/* icons */
+div.jbox span.jbox-icon{background:url(images/jbox-icons.png) no-repeat scroll 0 0 transparent;_background:url(images/jbox-icons-ie6.gif) no-repeat scroll 0 0 transparent;}
+div.jbox span.jbox-icon-info {background-position:0 0;}
+div.jbox span.jbox-icon-question {background-position:-36px 0;}
+div.jbox span.jbox-icon-success {background-position:-72px 0;}
+div.jbox span.jbox-icon-warning {background-position:-108px 0;}
+div.jbox span.jbox-icon-error {background-position:-144px 0;}
+div.jbox span.jbox-icon-none {display: none; overflow:hidden;}
+div.jbox span.jbox-icon-loading {background:url(images/jbox-loading1.gif) no-repeat scroll 0 0 transparent;}
\ No newline at end of file

apps/static/jbox/Skins2/jumpserver/Desktop.ini

+[.ShellClassInfo]
+IconFile=%SystemRoot%\system32\SHELL32.dll
+IconIndex=161

apps/static/jbox/Skins2/jumpserver/jbox.css

+@charset "utf-8";
+
+*:focus {outline: none;}
+/* fade */
+.jbox-fade{background-color:#000000;}
+/* drag */
+.jbox-drag{border:1px dashed #0097d4;}
+/* jbox */
+div.jbox {padding:0px;border:none;font-size:12px;}
+/* border */
+div.jbox .jbox-border{background: none repeat scroll 0 0 #000000;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}
+/* container */
+div.jbox .jbox-container{background-color:#ffffff;border:1px solid #999999;}
+/* title-panel */
+div.jbox .jbox-title-panel{background: #2f4050;background: -webkit-gradient(linear, left top, left bottom, from(#2f4050), to(#2f4050));background: -moz-linear-gradient(top,  #2f4050,  #2f4050);filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2f4050', endColorstr='#2f4050');border-bottom:1px solid #999999;}
+div.jbox .jbox-title{font-weight:bold;color:#ffffff;}
+div.jbox .jbox-title-icon{background:url(images/jbox-title-icon.gif) no-repeat scroll 3px 5px transparent;}
+div.jbox .jbox-close,div.jbox .jbox-close-hover{background:url(images/jbox-close1.gif) no-repeat scroll 0px 0px transparent;}
+div.jbox .jbox-close-hover{background-position:-16px 0;}
+/* content */
+div.jbox .jbox-content{min-height:24px;line-height:18px;color:#444444;}
+div.jbox .jbox-content-loading{background-color:#E6E6E6;}
+div.jbox .jbox-content-loading-image{background:url(images/jbox-content-loading.gif) no-repeat bottom center;}
+/* button-panel */
+div.jbox .jbox-button-panel{border-top:1px solid #CCCCCC;background-color: #EEEEEE;}
+div.jbox .jbox-bottom-text{text-indent:10px;color:#444444;}
+div.jbox .jbox-button{background: #0097d4;background: -webkit-gradient(linear, left top, left bottom, from(#2f4050), to(#2f4050));background: -moz-linear-gradient(top,  #2f4050,  #2f4050);filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2f4050', endColorstr='#2f4050');border:#004b6a 1px solid;color:#fff;border-radius:3px 3px 3px 3px;margin:1px 7px 0px 0px;height:22px;cursor:default;}
+div.jbox .jbox-button-hover{background: #0097d4;background: -webkit-gradient(linear, left top, left bottom, from(#0097d4), to(#005b7f));background: -moz-linear-gradient(top,  #0097d4,  #005b7f);filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0097d4', endColorstr='#005b7f');}
+div.jbox .jbox-button-active{background: -webkit-gradient(linear, left top, left bottom, from(#005b7f), to(#0097d4));background: -moz-linear-gradient(top,  #005b7f,  #0097d4);filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005b7f', endColorstr='#0097d4');}
+div.jbox-warning .jbox .jbox-button-panel{background-color: #FFFFFF;}
+/* tip-color */
+div.jbox .jbox-tip-color{background: #0097d4;background: -webkit-gradient(linear, left top, left bottom, from(#0097d4), to(#005b7f));background: -moz-linear-gradient(top,  #0097d4,  #005b7f);filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0097d4', endColorstr='#005b7f');border-color:#004b6a;border-radius:3px 3px 3px 3px;color:#fff;}
+/* icons */
+div.jbox span.jbox-icon{background:url(images/jbox-icons.png) no-repeat scroll 0 0 transparent;_background:url(images/jbox-icons-ie6.gif) no-repeat scroll 0 0 transparent;}
+div.jbox span.jbox-icon-info {background-position:0 0;}
+div.jbox span.jbox-icon-question {background-position:-36px 0;}
+div.jbox span.jbox-icon-success {background-position:-72px 0;}
+div.jbox span.jbox-icon-warning {background-position:-108px 0;}
+div.jbox span.jbox-icon-error {background-position:-144px 0;}
+div.jbox span.jbox-icon-none {display: none; overflow:hidden;}
+div.jbox span.jbox-icon-loading {background:url(images/jbox-loading1.gif) no-repeat scroll 0 0 transparent;}
\ No newline at end of file

apps/static/jbox/i18n/jquery.jBox-zh-CN.js

+
+/* jBox 全局设置 */
+var jBoxConfig = {};
+
+jBoxConfig.defaults = {
+    id: null, /* 在页面中的唯一id，如果为null则自动生成随机id,一个id只会显示一个jBox */
+    top: '15%', /* 窗口离顶部的距离,可以是百分比或像素(如 '100px') */
+    border: 5, /* 窗口的外边框像素大小,必须是0以上的整数 */
+    opacity: 0.1, /* 窗口隔离层的透明度,如果设置为0,则不显示隔离层 */
+    timeout: 0, /* 窗口显示多少毫秒后自动关闭,如果设置为0,则不自动关闭 */
+    showType: 'fade', /* 窗口显示的类型,可选值有:show、fade、slide */
+    showSpeed: 'fast', /* 窗口显示的速度,可选值有:'slow'、'fast'、表示毫秒的整数 */
+    showIcon: true, /* 是否显示窗口标题的图标，true显示，false不显示，或自定义的CSS样式类名（以为图标为背景） */
+    showClose: true, /* 是否显示窗口右上角的关闭按钮 */
+    draggable: true, /* 是否可以拖动窗口 */
+    dragLimit: true, /* 在可以拖动窗口的情况下，是否限制在可视范围 */
+    dragClone: false, /* 在可以拖动窗口的情况下，鼠标按下时窗口是否克隆窗口 */
+    persistent: true, /* 在显示隔离层的情况下，点击隔离层时，是否坚持窗口不关闭 */
+    showScrolling: true, /* 是否显示浏览的滚动条 */
+    ajaxData: {},  /* 在窗口内容使用get:或post:前缀标识的情况下，ajax post的数据，例如：{ id: 1 } 或 "id=1" */
+    iframeScrolling: 'auto', /* 在窗口内容使用iframe:前缀标识的情况下，iframe的scrolling属性值，可选值有：'auto'、'yes'、'no' */
+
+    title: 'jBox', /* 窗口的标题 */
+    width: 350, /* 窗口的宽度，值为'auto'或表示像素的整数 */
+    height: 'auto', /* 窗口的高度，值为'auto'或表示像素的整数 */
+    bottomText: '', /* 窗口的按钮左边的内容，当没有按钮时此设置无效 */
+    buttons: { '确定': 'ok' }, /* 窗口的按钮 */
+    buttonsFocus: 0, /* 表示第几个按钮为默认按钮，索引从0开始 */
+    loaded: function (h) { }, /* 窗口加载完成后执行的函数，需要注意的是，如果是ajax或iframe也是要等加载完http请求才算窗口加载完成，参数h表示窗口内容的jQuery对象 */
+    submit: function (v, h, f) { return true; }, /* 点击窗口按钮后的回调函数，返回true时表示关闭窗口，参数有三个，v表示所点的按钮的返回值，h表示窗口内容的jQuery对象，f表示窗口内容里的form表单键值 */
+    closed: function () { } /* 窗口关闭后执行的函数 */
+};
+
+jBoxConfig.stateDefaults = {
+    content: '', /* 状态的内容，不支持前缀标识 */
+    buttons: { '确定': 'ok' }, /* 状态的按钮 */
+    buttonsFocus: 0, /* 表示第几个按钮为默认按钮，索引从0开始 */
+    submit: function (v, h, f) { return true; } /* 点击状态按钮后的回调函数，返回true时表示关闭窗口，参数有三个，v表示所点的按钮的返回值，h表示窗口内容的jQuery对象，f表示窗口内容里的form表单键值 */
+};
+
+jBoxConfig.tipDefaults = {
+    content: '', /* 提示的内容，不支持前缀标识 */
+    icon: 'info', /* 提示的图标，可选值有'info'、'success'、'warning'、'error'、'loading'，默认值为'info'，当为'loading'时，timeout值会被设置为0，表示不会自动关闭。 */
+    top: '40%', /* 提示离顶部的距离,可以是百分比或像素(如 '100px') */
+    width: 'auto', /* 提示的高度，值为'auto'或表示像素的整数 */
+    height: 'auto', /* 提示的高度，值为'auto'或表示像素的整数 */
+    opacity: 0, /* 窗口隔离层的透明度,如果设置为0,则不显示隔离层 */
+    timeout: 3000, /* 提示显示多少毫秒后自动关闭,必须是大于0的整数 */
+    closed: function () { } /* 提示关闭后执行的函数 */
+};
+
+jBoxConfig.messagerDefaults = {
+    content: '', /* 信息的内容，不支持前缀标识 */
+    title: 'jBox', /* 信息的标题 */
+    icon: 'none', /* 信息图标，值为'none'时为不显示图标，可选值有'none'、'info'、'question'、'success'、'warning'、'error' */
+    width: 350, /* 信息的高度，值为'auto'或表示像素的整数 */
+    height: 'auto', /* 信息的高度，值为'auto'或表示像素的整数 */
+    timeout: 3000, /* 信息显示多少毫秒后自动关闭,如果设置为0,则不自动关闭 */
+    showType: 'slide', /* 信息显示的类型,可选值有:show、fade、slide */
+    showSpeed: 600, /* 信息显示的速度,可选值有:'slow'、'fast'、表示毫秒的整数 */
+    border: 0, /* 信息的外边框像素大小,必须是0以上的整数 */
+    buttons: {}, /* 信息的按钮 */
+    buttonsFocus: 0, /* 表示第几个按钮为默认按钮，索引从0开始 */
+    loaded: function (h) { }, /* 窗口加载完成后执行的函数，参数h表示窗口内容的jQuery对象 */
+    submit: function (v, h, f) { return true; }, /* 点击信息按钮后的回调函数，返回true时表示关闭窗口，参数有三个，v表示所点的按钮的返回值，h表示窗口内容的jQuery对象，f表示窗口内容里的form表单键值 */
+    closed: function () { } /* 信息关闭后执行的函数 */
+};
+
+jBoxConfig.languageDefaults = {
+    close: '关闭', /* 窗口右上角关闭按钮提示 */
+    ok: '确定', /* $.jBox.prompt() 系列方法的“确定”按钮文字 */
+    yes: '是', /* $.jBox.warning() 方法的“是”按钮文字 */
+    no: '否', /* $.jBox.warning() 方法的“否”按钮文字 */
+    cancel: '取消' /* $.jBox.confirm() 和 $.jBox.warning() 方法的“取消”按钮文字 */
+};
+
+$.jBox.setDefaults(jBoxConfig);

apps/static/jbox/jquery-migrate-1.1.1.min.js

+/*!
+ * jQuery Migrate - v1.1.1 - 2013-02-16
+ * https://github.com/jquery/jquery-migrate
+ * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
+ */
+(function(s,p,i){var D={};s.migrateWarnings=[];if(!s.migrateMute&&p.console&&console.log){console.log("JQMIGRATE: Logging is active")}if(s.migrateTrace===i){s.migrateTrace=true}s.migrateReset=function(){D={};s.migrateWarnings.length=0};function h(G){if(!D[G]){D[G]=true;s.migrateWarnings.push(G);if(p.console&&console.warn&&!s.migrateMute){console.warn("JQMIGRATE: "+G);if(s.migrateTrace&&console.trace){console.trace()}}}}function a(I,K,H,J){if(Object.defineProperty){try{Object.defineProperty(I,K,{configurable:true,enumerable:true,get:function(){h(J);return H},set:function(L){h(J);H=L}});return}catch(G){}}s._definePropertyBroken=true;I[K]=H}if(document.compatMode==="BackCompat"){h("jQuery is not compatible with Quirks Mode")}var f=s("<input/>",{size:1}).attr("size")&&s.attrFn,x=s.attr,w=s.attrHooks.value&&s.attrHooks.value.get||function(){return null},j=s.attrHooks.value&&s.attrHooks.value.set||function(){return i},t=/^(?:input|button)$/i,y=/^[238]$/,B=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,k=/^(?:checked|selected)$/i;a(s,"attrFn",f||{},"jQuery.attrFn is deprecated");s.attr=function(K,I,L,J){var H=I.toLowerCase(),G=K&&K.nodeType;if(J){if(x.length<4){h("jQuery.fn.attr( props, pass ) is deprecated")}if(K&&!y.test(G)&&(f?I in f:s.isFunction(s.fn[I]))){return s(K)[I](L)}}if(I==="type"&&L!==i&&t.test(K.nodeName)&&K.parentNode){h("Can't change the 'type' of an input or button in IE 6/7/8")}if(!s.attrHooks[H]&&B.test(H)){s.attrHooks[H]={get:function(N,M){var P,O=s.prop(N,M);return O===true||typeof O!=="boolean"&&(P=N.getAttributeNode(M))&&P.nodeValue!==false?M.toLowerCase():i},set:function(N,P,M){var O;if(P===false){s.removeAttr(N,M)}else{O=s.propFix[M]||M;if(O in N){N[O]=true}N.setAttribute(M,M.toLowerCase())}return M}};if(k.test(H)){h("jQuery.fn.attr('"+H+"') may use property instead of attribute")
+}}return x.call(s,K,I,L)};s.attrHooks.value={get:function(H,G){var I=(H.nodeName||"").toLowerCase();if(I==="button"){return w.apply(this,arguments)}if(I!=="input"&&I!=="option"){h("jQuery.fn.attr('value') no longer gets properties")}return G in H?H.value:null},set:function(G,H){var I=(G.nodeName||"").toLowerCase();if(I==="button"){return j.apply(this,arguments)}if(I!=="input"&&I!=="option"){h("jQuery.fn.attr('value', val) no longer sets properties")}G.value=H}};var q,E,z=s.fn.init,A=s.parseJSON,v=/^(?:[^<]*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;s.fn.init=function(G,J,I){var H;if(G&&typeof G==="string"&&!s.isPlainObject(J)&&(H=v.exec(G))&&H[1]){if(G.charAt(0)!=="<"){h("$(html) HTML strings must start with '<' character")}if(J&&J.context){J=J.context}if(s.parseHTML){return z.call(this,s.parseHTML(s.trim(G),J,true),J,I)}}return z.apply(this,arguments)};s.fn.init.prototype=s.fn;s.parseJSON=function(G){if(!G&&G!==null){h("jQuery.parseJSON requires a valid JSON string");return null}return A.apply(this,arguments)};s.uaMatch=function(H){H=H.toLowerCase();var G=/(chrome)[ \/]([\w.]+)/.exec(H)||/(webkit)[ \/]([\w.]+)/.exec(H)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(H)||/(msie) ([\w.]+)/.exec(H)||H.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(H)||[];return{browser:G[1]||"",version:G[2]||"0"}};if(!s.browser){q=s.uaMatch(navigator.userAgent);E={};if(q.browser){E[q.browser]=true;E.version=q.version}if(E.chrome){E.webkit=true}else{if(E.webkit){E.safari=true}}s.browser=E}a(s,"browser",s.browser,"jQuery.browser is deprecated");s.sub=function(){function G(J,K){return new G.fn.init(J,K)}s.extend(true,G,this);G.superclass=this;G.fn=G.prototype=this();G.fn.constructor=G;G.sub=this.sub;G.fn.init=function I(J,K){if(K&&K instanceof s&&!(K instanceof G)){K=G(K)}return s.fn.init.call(this,J,K,H)};G.fn.init.prototype=G.fn;var H=G(document);h("jQuery.sub() is deprecated");return G};s.ajaxSetup({converters:{"text json":s.parseJSON}});var n=s.fn.data;s.fn.data=function(I){var H,G,J=this[0];if(J&&I==="events"&&arguments.length===1){H=s.data(J,I);
+G=s._data(J,I);if((H===i||H===G)&&G!==i){h("Use of jQuery.fn.data('events') is deprecated");return G}}return n.apply(this,arguments)};var o=/\/(java|ecma)script/i,u=s.fn.andSelf||s.fn.addBack;s.fn.andSelf=function(){h("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");return u.apply(this,arguments)};if(!s.clean){s.clean=function(G,H,N,J){H=H||document;H=!H.nodeType&&H[0]||H;H=H.ownerDocument||H;h("jQuery.clean() is deprecated");var K,I,L,O,M=[];s.merge(M,s.buildFragment(G,H).childNodes);if(N){L=function(P){if(!P.type||o.test(P.type)){return J?J.push(P.parentNode?P.parentNode.removeChild(P):P):N.appendChild(P)}};for(K=0;(I=M[K])!=null;K++){if(!(s.nodeName(I,"script")&&L(I))){N.appendChild(I);if(typeof I.getElementsByTagName!=="undefined"){O=s.grep(s.merge([],I.getElementsByTagName("script")),L);M.splice.apply(M,[K+1,0].concat(O));K+=O.length}}}}return M}}var c=s.event.add,b=s.event.remove,g=s.event.trigger,r=s.fn.toggle,d=s.fn.live,m=s.fn.die,C="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",e=new RegExp("\\b(?:"+C+")\\b"),F=/(?:^|\s)hover(\.\S+|)\b/,l=function(G){if(typeof(G)!=="string"||s.event.special.hover){return G}if(F.test(G)){h("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'")}return G&&G.replace(F,"mouseenter$1 mouseleave$1")};if(s.event.props&&s.event.props[0]!=="attrChange"){s.event.props.unshift("attrChange","attrName","relatedNode","srcElement")}if(s.event.dispatch){a(s.event,"handle",s.event.dispatch,"jQuery.event.handle is undocumented and deprecated")}s.event.add=function(J,H,I,K,G){if(J!==document&&e.test(H)){h("AJAX events should be attached to document: "+H)}c.call(this,J,l(H||""),I,K,G)};s.event.remove=function(K,I,J,G,H){b.call(this,K,l(I)||"",J,G,H)};s.fn.error=function(){var G=Array.prototype.slice.call(arguments,0);h("jQuery.fn.error() is deprecated");G.splice(0,0,"error");if(arguments.length){return this.bind.apply(this,G)}this.triggerHandler.apply(this,G);return this};s.fn.toggle=function(K,I){if(!s.isFunction(K)||!s.isFunction(I)){return r.apply(this,arguments)
+}h("jQuery.fn.toggle(handler, handler...) is deprecated");var H=arguments,G=K.guid||s.guid++,J=0,L=function(M){var N=(s._data(this,"lastToggle"+K.guid)||0)%J;s._data(this,"lastToggle"+K.guid,N+1);M.preventDefault();return H[N].apply(this,arguments)||false};L.guid=G;while(J<H.length){H[J++].guid=G}return this.click(L)};s.fn.live=function(G,I,H){h("jQuery.fn.live() is deprecated");if(d){return d.apply(this,arguments)}s(this.context).on(G,this.selector,I,H);return this};s.fn.die=function(G,H){h("jQuery.fn.die() is deprecated");if(m){return m.apply(this,arguments)}s(this.context).off(G,this.selector||"**",H);return this};s.event.trigger=function(I,J,H,G){if(!H&&!e.test(I)){h("Global events are undocumented and deprecated")}return g.call(this,I,J,H||document,G)};s.each(C.split("|"),function(H,G){s.event.special[G]={setup:function(){var I=this;if(I!==document){s.event.add(document,G+"."+s.guid,function(){s.event.trigger(G,null,I,true)});s._data(this,G,s.guid++)}return false},teardown:function(){if(this!==document){s.event.remove(document,G+"."+s._data(this,G))}return false}}})})(jQuery,window);
\ No newline at end of file

apps/static/js/jumpserver.js

@@ -4,10 +4,10 @@
 var checked=false;
 function check_all(form) {
     var checkboxes = document.getElementById(form);
-    if (checked == false) {
-        checked = true
+    if (checked === false) {
+        checked = true;
     } else {
-        checked = false
+        checked = false;
     }
     for (var i = 0; i < checkboxes.elements.length; i++) {
         if (checkboxes.elements[i].type == "checkbox") {
@@ -51,13 +51,13 @@ function GetRowData(row){
 //此函数用于在多选提交时至少要选择一行
 function GetTableDataBox() {
     var tabProduct = document.getElementById("editable");
-    var tableData = new Array();
-    var returnData = new Array();
+    var tableData = [];
+    var returnData = [];
     var checkboxes = document.getElementById("contents_form");
-    var id_list = new Array();
+    var id_list = [];
     len = checkboxes.elements.length;
     for (var i=0; i < len; i++) {
-        if (checkboxes.elements[i].type == "checkbox" && checkboxes.elements[i].checked == true && checkboxes.elements[i].value != "checkall") {
+        if (checkboxes.elements[i].type == "checkbox" && checkboxes.elements[i].checked === true && checkboxes.elements[i].value != "checkall") {
             id_list.push(i);
          }
         }
@@ -67,7 +67,7 @@ function GetTableDataBox() {
         tableData.push(GetRowData(tabProduct.rows[id_list[i]]));
     }
 
-    if (id_list.length == 0){
+    if (id_list.length === 0){
         alert('请至少选择一行！');
     }
     returnData.push(tableData);
@@ -77,7 +77,7 @@ function GetTableDataBox() {
 
 function move(from, to, from_o, to_o) {
     $("#" + from + " option").each(function () {
-        if ($(this).prop("selected") == true) {
+        if ($(this).prop("selected") === true) {
             $("#" + to).append(this);
             if( typeof from_o !== 'undefined'){
                 $("#"+to_o).append($("#"+from_o +" option[value='"+this.value+"']"));
@@ -88,7 +88,7 @@ function move(from, to, from_o, to_o) {
 
 function move_left(from, to, from_o, to_o) {
     $("#" + from + " option").each(function () {
-        if ($(this).prop("selected") == true) {
+        if ($(this).prop("selected") === true) {
             $("#" + to).append(this);
             if( typeof from_o !== 'undefined'){
                 $("#"+to_o).append($("#"+from_o +" option[value='"+this.value+"']"));
@@ -126,8 +126,8 @@ function move_left(from, to, from_o, to_o) {
 function selectAll(){
     // 选择该页面所有option
     $('option').each(function(){
-        $(this).attr('selected', true)
-    })
+        $(this).attr('selected', true);
+    });
 }
 
 
@@ -156,6 +156,8 @@ function getIDall() {
 function APIUpdateAttr(props) {
   // props = {url: .., body: , success: , error: , method: ,}
   props = props || {};
+  success_message = props.success_message || 'Update Successfully!';
+  fail_message = props.fail_message || 'Error occurred while updating.';
   $.ajax({
     url: props.url,
     type: props.method || "PATCH",
@@ -164,18 +166,18 @@ function APIUpdateAttr(props) {
     dataType: props.data_type || "json",
   }).done(function(data, textStatue, jqXHR) {
     if (typeof props.success === 'function') {
-      return props.success(data)
+      return props.success(data);
     } else {
-      toastr.success('Update Success!')
+      toastr.success(success_message);
     }
   }).fail(function(jqXHR, textStatue, errorThrown) {
     if (typeof props.error === 'function') {
-      return props.error(errorThrown)
+      return props.error(errorThrown);
     } else {
-      toastr.error('Error occurred while updating.')
+      toastr.error(fail_message);
     }
-  })
+  });
   return true;
 }
 
-var jumpserver = new Object();
+var jumpserver = {};

apps/templates/_foot_js.html

+{% load i18n %}
 {% load static %}
 <!-- Mainly scripts -->
 <script src="{% static "js/plugins/metisMenu/jquery.metisMenu.js" %}"></script>
@@ -52,5 +53,36 @@ $.ajaxSetup({
 
 // textarea rows
 $('textarea').attr('rows', 5)
+
+
+
+//Sweet Alert for Delete
+function obj_del(obj,name,url){
+    swal({
+        title: "{% trans 'Are you sure delete ??' %}",
+        //text: "You will not be able to recover this imaginary file!",
+        text: "【"+name+"】",
+        type: "warning",
+        showCancelButton: true,
+        cancelButtonText: "{% trans 'Cancel' %}",
+        confirmButtonColor: "#DD6B55",
+        confirmButtonText: "{% trans 'Yes, delete it!' %}",
+        closeOnConfirm: false
+    }, function () {
+        $.ajax({
+            type : "post",
+            url : url,
+            data : {
+           // idc_id : idc_id
+            },
+            success : function(data) {
+            swal("{% trans 'Deleted!' %}", "【"+name+"】"+"{% trans 'has been deleted.' %}", "success");
+            $(obj).parent().parent().remove();
+            },
+            dataType : "text"
+            });
+    });
+}
+
 </script>
 <script src="{% static "js/jumpserver.js" %}"></script>

apps/templates/_head_css_js.html

@@ -4,13 +4,25 @@
 <link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
 <link href="{% static "css/font-awesome.css" %}" rel="stylesheet">
 <link href="{% static "css/plugins/toastr/toastr.min.css" %}" rel="stylesheet">
+<link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
 <link href="{% static "css/style.css" %}" rel="stylesheet">
-
 <link href="{% static "css/plugins/vaildator/jquery.validator.css" %}" rel="stylesheet">
 
+
+
 <!-- scripts -->
-<script src="{% static "js/jquery-2.1.1.js" %}"></script>
-<script src="{% static "js/bootstrap.min.js" %}"></script>
+<script src="{% static 'js/jquery-2.1.1.js' %}"></script>
+
+<!-- Jbox -->
+<link href="{% static 'jbox/Skins2/jumpserver/jbox.css' %}" rel="stylesheet">
+<script src="{% static 'jbox/jquery-migrate-1.1.1.min.js' %}"></script>
+<script src="{% static 'jbox/jquery.jBox-2.3.min.js' %}"></script>
+<script src="{% static 'jbox/i18n/jquery.jBox-zh-CN.js' %}"></script>
+
+<!-- Sweet alert -->
+<script src="{% static 'js/plugins/sweetalert/sweetalert.min.js' %}"></script>
+
+<script src="{% static 'js/bootstrap.min.js' %}"></script>
 
 
 

apps/templates/_modal.html

+{% load i18n %}
+<div aria-hidden="true" role="dialog" tabindex="-1" id="{% block modal_id %}{% endblock %}" class="modal inmodal" style="display: none;">
+    <div class="modal-dialog">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header">
+                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+                <h4 class="modal-title">{% block modal_title %}{% endblock %}</h4>
+                <small>{% block modal_comment %}{% endblock %}</small>
+            </div>
+            <div class="modal-body">
+              {% block modal_body %}
+              {% endblock %}
+            </div>
+            <div class="modal-footer">
+              <button data-dismiss="modal" class="btn btn-white" type="button">{% trans "Close" %}</button>
+              <button class="btn btn-primary" type="button" id="{% block modal_confirm_id %}{% endblock %}">{% trans 'Confirm' %}</button>
+            </div>
+        </div>
+    </div>
+</div>

apps/users/api.py

@@ -6,6 +6,7 @@ import logging
 from rest_framework import generics
 
 from .serializers import UserSerializer, UserGroupSerializer, UserAttributeSerializer, UserGroupEditSerializer
+from .serializers import UserPKUpdateSerializer
 from .models import User, UserGroup
 
 
@@ -49,3 +50,25 @@ class UserAttributeApi(generics.RetrieveUpdateDestroyAPIView):
 class UserGroupEditApi(generics.RetrieveUpdateAPIView):
     queryset = User.objects.all()
     serializer_class = UserGroupEditSerializer
+
+
+class UserResetPasswordApi(generics.UpdateAPIView):
+    queryset = User.objects.all()
+    serializer_class = UserGroupEditSerializer
+
+    def perform_update(self, serializer):
+        # Note: we are not updating the user object here.
+        # We just do the reset-password staff.
+        user = self.get_object()
+        from .utils import send_reset_password_mail
+        send_reset_password_mail(user)
+
+
+class UserResetPKApi(generics.UpdateAPIView):
+    queryset = User.objects.all()
+    serializer_class = UserPKUpdateSerializer
+
+    def perform_update(self, serializer):
+        user = self.get_object()
+        user.private_key = serializer.validated_data['_private_key']
+        user.save()

apps/users/serializers.py

 # -*- coding: utf-8 -*-
 #
 
+from django.utils.translation import ugettext_lazy as _
+
 from rest_framework import serializers
 
 from .models import User, UserGroup
@@ -38,3 +40,17 @@ class UserGroupEditSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
         fields = ['id', 'groups']
+
+
+class UserPKUpdateSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = User
+        fields = ['id', '_private_key']
+
+    def validate__private_key(self, value):
+        from users.utils import validate_ssh_pk
+        checked, reason = validate_ssh_pk(value)
+        if not checked:
+            raise serializers.ValidationError(_('Not a valid ssh private key.'))
+        return value

apps/users/templates/users/_user_reset_pk_modal.html

+{% extends '_modal.html' %}
+{% load i18n %}
+{% block modal_id %}user_reset_pk_modal{% endblock %}
+{% block modal_title%}{% trans 'Reset User SSH Private Key' %}{% endblock %}
+{% block modal_body %}
+<textarea id="txt_pk" class="form-control" cols="30" rows="10" placeholder="-----BEGIN RSA PRIVATE KEY-----"></textarea>
+{% endblock %}
+{% block modal_confirm_id %}btn_user_reset_pk{% endblock %}

apps/users/templates/users/user_list.html

@@ -19,7 +19,7 @@
 {% endblock %}
 
 {% block table_body %}
-     {% for user in user_list %}
+     {% for user in object_list %}
          <tr class="gradeX">
              <td class="text-center">
                  <input type="checkbox" name="checked" value="{{ user.id }}">
@@ -42,7 +42,8 @@
              </td>
              <td class="text-center">
                  <a href="{% url 'users:user-update' pk=user.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
-                 <a href="{% url 'users:user-delete' pk=user.id %}" class="btn btn-xs btn-danger del {% if user.id == request.user.id or user.username == 'admin' %} disabled {% endif %}">{% trans 'Delete' %}</a>
+                 <!--<a href="{% url 'users:user-delete' pk=user.id %}" class="btn btn-xs btn-danger del {% if user.id == request.user.id or user.username == 'admin' %} disabled {% endif %}">{% trans 'Delete' %}</a>-->
+                 <a onclick="obj_del(this,'{{ user.name }}','{% url 'users:user-delete' user.id %}')" class="btn btn-xs btn-danger del {% if user.id == request.user.id or user.username == 'admin' %} disabled {% endif %}">{% trans 'Delete' %}</a>
              </td>
          </tr>
      {% endfor %}

apps/users/urls.py

@@ -35,6 +35,8 @@ urlpatterns += [
         api.UserDetailDeleteUpdateApi.as_view(), name='user-detail-api'),
     url(r'^v1/users/(?P<pk>[0-9]+)/patch$',
         api.UserAttributeApi.as_view(), name='user-patch-api'),
+    url(r'^v1/users/(?P<pk>\d+)/reset-password/$', api.UserResetPasswordApi.as_view(), name='user-reset-password-api'),
+    url(r'^v1/users/(?P<pk>\d+)/reset-pk/$', api.UserResetPKApi.as_view(), name='user-reset-pk-api'),
     url(r'^v1/user-groups$', api.UserGroupListAddApi.as_view(), name='user-group-list-api'),
     url(r'^v1/user-groups/(?P<pk>[0-9]+)$',
         api.UserGroupDetailDeleteUpdateApi.as_view(), name='user-group-detail-api'),

apps/users/utils.py

@@ -5,6 +5,7 @@ import logging
 import os
 import re
 
+from django.conf import settings
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _
@@ -121,6 +122,8 @@ def send_reset_password_mail(user):
         'email': user.email,
         'login_url': reverse('users:login', external=True),
     }
+    if settings.DEBUG:
+        logger.debug(message)
 
     send_mail_async.delay(subject, message, recipient_list, html_message=message)
 

apps/users/views.py

@@ -10,7 +10,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.core.files.storage import default_storage
 from django.db.models import Q
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect,HttpResponse
 from django.shortcuts import get_object_or_404, reverse, redirect
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext as _
@@ -94,7 +94,6 @@ class UserListView(AdminUserRequiredMixin, ListView):
         if keyword:
             self.queryset = self.queryset.filter(Q(username__icontains=keyword) |
                                                  Q(name__icontains=keyword))
-
         if sort:
             self.queryset = self.queryset.order_by(sort)
         return self.queryset
@@ -163,6 +162,19 @@ class UserDeleteView(AdminUserRequiredMixin, DeleteView):
     success_url = reverse_lazy('users:user-list')
     template_name = 'users/user_delete_confirm.html'
 
+    def delete(self, request, *args, **kwargs):
+        """
+        Calls the delete() method on the fetched object and then
+        redirects to the success URL.
+        """
+        self.object = self.get_object()
+        success_url = self.get_success_url()
+        if self.object.name == "admin" or self.object.id == request.session.get('_auth_user_id'):
+            pass
+        else:
+            self.object.delete()
+
+        return HttpResponseRedirect(success_url)
 
 class UserDetailView(AdminUserRequiredMixin, DetailView):
     model = User