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

templates/jasset/asset_list.html

@@ -374,7 +374,7 @@
             $.ajax({
                 type: "post",
                 data: {asset_id_all: asset_id_all},
-                url: "{% url 'asset_add_batch' %}",
+                url: "{% url 'asset_update_batch' %}",
                 success: function () {
                     parent.location.reload();
                 }

templates/jperm/perm_role_add.html

@@ -51,7 +51,7 @@
                                 <label for="role_key" class="col-sm-2 control-label">用户密钥</label>
                                 <div class="col-sm-8">
                                     <textarea class="form-control" name="role_key" placeholder="请复制粘贴私钥" rows="10" style="font-size: 9px;"></textarea>
-                                    <span class="help-block m-b-none">如果不添加密钥，会自动生成, 密码密钥必填一项</span>
+                                    <span class="help-block m-b-none">如果不添加密钥，会自动生成 </span>
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>

templates/jperm/perm_role_list.html

@@ -87,7 +87,7 @@ function remove_role(role_id){
     if (confirm("确认删除")) {
         $.ajax({
            type: "POST",
-           url: "/jperm/role/perm_role_delete/",
+           url: "{% url 'role_del' %}",
            data: "id=" + role_id,
            success: function(msg){
                alert( "成功: " + msg );