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

修复 

1. 推送时 验证改为  /usr/sbin/visudo -c
2. 添加系统用户的key 认证更改 支持 RSA|DSA
3. web terminal 行数 -1
pull/71/head
ibuler 2016-02-22 16:29:36 +08:00
parent 2e5c01a4da
commit 7323b72c4b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/jasset/asset_list.html
View File

@ -243,8 +243,9 @@
area: ['628px', '420px'], area: ['628px', '420px'],
content: new_url+data content: new_url+data
}); });
window.open(new_url+data, '_blank', 'toolbar=yes, location=yes, scrollbars=yes, resizable=yes, copyhistory=yes, width=628, height=400')
*/ */
window.open(new_url+data, '', 'width=628px, height=380px') window.open(new_url+data, '', 'width=628px, height=380px');
} else if (dataArray.length == 1 && data != 'error'){ } else if (dataArray.length == 1 && data != 'error'){
/*layer.open({ /*layer.open({
type: 2, type: 2,
@ -255,7 +256,7 @@
content: new_url+data content: new_url+data
}); });
*/ */
window.open(new_url+data, '', 'width=628px, height=440px') window.open(new_url+data, '_blank', 'toolbar=yes, location=yes, copyhistory=yes, scrollbars=yes, width=628, height=410');
} }
else { else {
@ -292,7 +293,7 @@
content: new_url content: new_url
}); });
*/ */
window.open(new_url, '', 'height=628px, width=380px') window.open(new_url, '_blank', 'toolbar=yes, location=yes, copyhistory=yes, scrollbars=yes, width=628, height=400')
} else { } else {
/* /*
@ -305,7 +306,7 @@
content: new_url content: new_url
}); });
*/ */
window.open(new_url, '', 'height=628px, width=452px') window.open(new_url, '_blank', 'toolbar=yes, location=yes, copyhistory=yes, scrollbars=yes, width=628, height=410');
} }
return false return false