Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev

jasset/models.py

@@ -45,7 +45,7 @@ class IDC(models.Model):
     phone = models.CharField(max_length=32, blank=True, null=True, default='', verbose_name=u'联系电话')
     address = models.CharField(max_length=128, blank=True, null=True, default='', verbose_name=u"机房地址")
     network = models.TextField(blank=True, null=True, default='', verbose_name=u"IP地址段")
-    date_added = models.DateField(auto_now=True, default='', null=True)
+    date_added = models.DateField(auto_now=True, null=True)
     operator = models.CharField(max_length=32, blank=True, default='', null=True, verbose_name=u"运营商")
     comment = models.CharField(max_length=128, blank=True, default='', null=True, verbose_name=u"备注")
 

jperm/ansible_api.py

@@ -16,7 +16,7 @@ from passlib.hash import sha512_crypt
 from django.template.loader import get_template
 from django.template import Context
 
-from utils import get_rand_pass
+
 from jumpserver.api import logger
 
 

jperm/views.py

@@ -53,21 +53,27 @@ def perm_rule_detail(request):
     header_title, path1, path2 = "授权规则", "规则管理", "规则详情"
 
     # 根据rule_id 取得rule对象
-    rule_id = request.GET.get("id")
+    try:
-    rule_obj = PermRule.objects.get(id=rule_id)
+        if request.method == "GET":
-    user_obj = rule_obj.user.all()
+            rule_id = request.GET.get("id")
-    user_group_obj = rule_obj.user_group.all()
+            if not rule_id:
-    asset_obj = rule_obj.asset.all()
+                raise ServerError("Rule Detail - no rule id get")
-    asset_group_obj = rule_obj.asset_group.all()
+            rule_obj = PermRule.objects.get(id=rule_id)
-    roles_name = [role.name for role in rule_obj.role.all()]
+            user_obj = rule_obj.user.all()
+            user_group_obj = rule_obj.user_group.all()
+            asset_obj = rule_obj.asset.all()
+            asset_group_obj = rule_obj.asset_group.all()
+            roles_name = [role.name for role in rule_obj.role.all()]
 
-    # 渲染数据
+            # 渲染数据
-    roles_name = ','.join(roles_name)
+            roles_name = ','.join(roles_name)
-    rule = rule_obj
+            rule = rule_obj
-    users = user_obj
+            users = user_obj
-    user_groups = user_group_obj
+            user_groups = user_group_obj
-    assets = asset_obj
+            assets = asset_obj
-    asset_groups = asset_group_obj
+            asset_groups = asset_group_obj
+    except ServerError, e:
+        logger.warning(e)
 
     return my_render('jperm/perm_rule_detail.html', locals(), request)
 
@@ -349,20 +355,25 @@ def perm_role_detail(request):
     # 渲染数据
     header_title, path1, path2 = "系统用户", "系统用户管理", "系统用户详情"
 
-    if request.method == "GET":
+    try:
-        role_id = request.GET.get("id")
+        if request.method == "GET":
-        role = get_object(PermRole, id=role_id)
+            role_id = request.GET.get("id")
-        role_info = get_role_info(role_id)
+            if not role_id:
+                raise ServerError("not role id")
+            role = get_object(PermRole, id=role_id)
+            role_info = get_role_info(role_id)
 
-        # 渲染数据
+            # 渲染数据
-        rules = role_info.get("rules")
+            rules = role_info.get("rules")
-        assets = role_info.get("assets")
+            assets = role_info.get("assets")
-        asset_groups = role_info.get("asset_groups")
+            asset_groups = role_info.get("asset_groups")
-        users = role_info.get("users")
+            users = role_info.get("users")
-        user_groups = role_info.get("user_groups")
+            user_groups = role_info.get("user_groups")
-        pushed_asset, need_push_asset = get_role_push_host(get_object(PermRole, id=role_id))
+            pushed_asset, need_push_asset = get_role_push_host(get_object(PermRole, id=role_id))
+    except ServerError, e:
+        logger.warning(e)
 
-        return my_render('jperm/perm_role_detail.html', locals(), request)
+    return my_render('jperm/perm_role_detail.html', locals(), request)
 
 
 @require_role('admin')

templates/jasset/idc_list.html

@@ -67,7 +67,7 @@
                                 <td class="text-center">
 
                                     <a href="{% url 'idc_edit' %}?id={{ post.id }}" class="btn btn-xs btn-info">编辑</a>
-                                    <a href="{% url 'idc_del' %}?id={{ post.id }}" class="btn btn-xs btn-danger idc_del">删除</a>
+                                    <a value="{% url 'idc_del' %}?id={{ post.id }}" class="btn btn-xs btn-danger idc_del">删除</a>
                                 </td>
                             </tr>
                         {% endfor %}

templates/jperm/perm_sudo_list.html

@@ -89,7 +89,7 @@ function remove_sudo(sudo_id){
     if (confirm("确认删除")) {
         $.ajax({
            type: "POST",
-           url: "/jperm/sudo/perm_sudo_delete/",
+           url: "/jperm/sudo/del/",
            data: "id=" + sudo_id,
            success: function(msg){
                alert( "成功: " + msg );