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

修改move

pull/6/head
ibuler 2015-04-16 14:32:51 +08:00
parent c08cee8052
commit 60cb5561f0
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jumpserver.conf
View File

@ -1,7 +1,7 @@
#coding: utf8 #coding: utf8
[base] [base]
ip = 192.168.173.129 ip = 192.168.20.209
port = 80 port = 80
key = 88aaaf7ffe3c6c04 key = 88aaaf7ffe3c6c04

5
juser/views.py
View File

@ -725,9 +725,10 @@ def user_add_adm(request):
鎮ㄧ殑瑙掕壊锛 %s 鎮ㄧ殑瑙掕壊锛 %s
鎮ㄧ殑web鐧诲綍瀵嗙爜锛 %s 鎮ㄧ殑web鐧诲綍瀵嗙爜锛 %s
鎮ㄧ殑ssh鐧诲綍瀵嗙爜锛 %s 鎮ㄧ殑ssh鐧诲綍瀵嗙爜锛 %s
瀵嗛挜涓嬭浇鍦板潃锛 %s 瀵嗛挜涓嬭浇鍦板潃锛 http://%s:%s/juser/down_key/?id=%s
璇存槑锛 璇风櫥闄嗗悗鍐嶄笅杞藉瘑閽锛 璇存槑锛 璇风櫥闄嗗悗鍐嶄笅杞藉瘑閽锛
""" % (name, username, dept.name, '鏅氱敤鎴', password, ssh_key_pwd, ssh_key_pwd) """ % (name, username, dept.name, '鏅氱敤鎴',
password, ssh_key_pwd, SEND_IP, SEND_PORT, user.id)
print MAIL_FROM print MAIL_FROM
send_mail(mail_title, mail_msg, MAIL_FROM, [email], fail_silently=False) send_mail(mail_title, mail_msg, MAIL_FROM, [email], fail_silently=False)
msg = u'娣诲姞鐢ㄦ埛 %s 鎴愬姛锛 鐢ㄦ埛瀵嗙爜宸插彂閫佸埌 %s 閭锛' % (username, email) msg = u'娣诲姞鐢ㄦ埛 %s 鎴愬姛锛 鐢ㄦ埛瀵嗙爜宸插彂閫佸埌 %s 閭锛' % (username, email)

29
static/js/base.js
View File

@ -59,10 +59,13 @@ function GetTableDataBox() {
return returnData; return returnData;
} }
function move(from, to) { function move(from, to, from_o, to_o) {
$("#" + from + " option").each(function () { $("#" + from + " option").each(function () {
if ($(this).prop("selected") == true) { if ($(this).prop("selected") == true) {
$("#" + to).append(this); $("#" + to).append(this);
if( typeof from_o !== 'undefined'){
$("#"+to_o).append($("#"+from_o +" option[value='"+this.value+"']"));
}
} }
}); });
} }
@ -76,12 +79,12 @@ function move_left(from, to) {
}); });
} }
function move_all(from, to) { //function move_all(from, to) {
$("#" + from).children().each(function () { // $("#" + from).children().each(function () {
$("#" + to).append(this); // $("#" + to).append(this);
}); // });
} //}
//
function selectAll(){ function selectAll(){
var checklist = document.getElementsByName ("selected"); var checklist = document.getElementsByName ("selected");
@ -100,12 +103,12 @@ function selectAll(){
} }
//
function move_all(from, to){ //function move_all(from, to){
$("#"+from).children().each(function(){ // $("#"+from).children().each(function(){
$("#"+to).append(this); // $("#"+to).append(this);
}); // });
} //}
//function commit_select(form_array){ //function commit_select(form_array){
// $('#{0} option'.format(form_array)).each(function(){ // $('#{0} option'.format(form_array)).each(function(){

4
templates/jperm/dept_perm_edit.html
View File

@ -101,8 +101,8 @@ function search_ip(text, noselect, total){
<div class="col-sm-1"> <div class="col-sm-1">
<div class="btn-group" style="margin-top: 60px;"> <div class="btn-group" style="margin-top: 60px;">
<button type="button" class="btn btn-white" onclick="move('assets', 'asset_select' )"><i class="fa fa-chevron-right"></i></button> <button type="button" class="btn btn-white" onclick="move('assets', 'asset_select', 'assets_total', 'asset_select_total' )"><i class="fa fa-chevron-right"></i></button>
<button type="button" class="btn btn-white" onclick="move('asset_select', 'assets')"><i class="fa fa-chevron-left"></i> </button> <button type="button" class="btn btn-white" onclick="move('asset_select', 'assets', 'asset_select_total', 'assets_total')"><i class="fa fa-chevron-left"></i> </button>
</div> </div>
</div> </div>