github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/26/head
wangyong 2015-12-14 18:42:27 +08:00
parent c6e0b2007d 2496f1c654
commit f249509817
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/jasset/asset_list.html
View File

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

2
templates/jperm/perm_role_add.html
View File

@ -51,7 +51,7 @@
<label for="role_key" class="col-sm-2 control-label">用户密钥</label> <label for="role_key" class="col-sm-2 control-label">用户密钥</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea class="form-control" name="role_key" placeholder="请复制粘贴私钥" rows="10" style="font-size: 9px;"></textarea> <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> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>

2
templates/jperm/perm_role_list.html
View File

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