Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
e0179ea3
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e0179ea3
编写于
3月 24, 2017
作者:
右
右书僮
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除资产HTML页面中SystemUser相关内容(视图中的相关API暂时未动)
上级
c931d317
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
90 addition
and
133 deletion
+90
-133
apps/assets/templates/assets/asset_detail.html
apps/assets/templates/assets/asset_detail.html
+39
-82
apps/assets/templates/assets/system_user_list.html
apps/assets/templates/assets/system_user_list.html
+51
-51
未找到文件。
apps/assets/templates/assets/asset_detail.html
浏览文件 @
e0179ea3
...
...
@@ -173,21 +173,13 @@
</td>
</tr>
<tr>
<td>
{% trans 'Test system
users
' %}:
</td>
<td>
{% trans 'Test system
pingpong
' %}:
</td>
<td>
<span
class=
"pull-right"
>
<button
type=
"button"
class=
"btn btn-primary btn-xs"
id=
"btn_reset_pk"
style=
"width: 54px;"
>
{% trans 'Test' %}
</button>
</span>
</td>
</tr>
<tr>
<td>
{% trans 'Repush system users' %}:
</td>
<td>
<span
class=
"pull-right"
>
<button
type=
"button"
class=
"btn btn-primary btn-xs"
id=
"btn_reset_pk"
style=
"width: 54px;"
>
{% trans 'Push' %}
</button>
</span>
</td>
</tr>
</tbody>
</table>
...
...
@@ -230,41 +222,6 @@
</table>
</div>
</div>
<div
class=
"panel panel-warning"
>
<div
class=
"panel-heading"
>
<i
class=
"fa fa-info-circle"
></i>
{% trans 'System users' %}
</div>
<div
class=
"panel-body"
>
<table
class=
"table group_edit"
id=
"add-asset2systemuser"
>
<tbody>
<form>
<tr
class=
"no-borders-tr"
>
<td
colspan=
"2"
>
<select
data-placeholder=
"{% trans 'Select system user' %}"
class=
"select2"
style=
"width: 100%"
multiple=
""
tabindex=
"4"
>
{% for system_user in system_users_remain %}
<option
value=
"{{ system_user.id }}"
id=
"opt_{{ system_user.id }}"
>
{{ system_user.name }}
</option>
{% endfor %}
</select>
</td>
</tr>
<tr
class=
"no-borders-tr"
>
<td
colspan=
"2"
>
<button
type=
"button"
class=
"btn btn-warning btn-sm btn-system-user"
>
{% trans 'Associate' %}
</button>
</td>
</tr>
</form>
{% for system_user in system_users %}
<tr>
<td
><b
class=
"bdg_group"
data-sid=
{{
system_user.id
}}
>
{{ system_user.name }}
</b></td>
<td>
<button
class=
"btn btn-danger btn-xs pull-right btn_leave_system"
type=
"button"
style=
"float: right;"
><i
class=
"fa fa-minus"
></i></button>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
...
...
@@ -343,9 +300,9 @@ $(document).ready(function () {
delete
jumpserver
.
groups_selected
[
data
.
id
]
})
})
.
on
(
'
click
'
,
'
#is_active
'
,
function
()
{
var
the_url
=
'
{% url "api-assets:asset-detail" pk=asset.id %}
'
;
var
checked
=
$
(
this
).
prop
(
'
checked
'
);
.
on
(
'
click
'
,
'
#is_active
'
,
function
()
{
var
the_url
=
'
{% url "api-assets:asset-detail" pk=asset.id %}
'
;
var
checked
=
$
(
this
).
prop
(
'
checked
'
);
var
body
=
{
'
is_active
'
:
checked
};
...
...
@@ -357,23 +314,23 @@ $(document).ready(function () {
success_message
:
success
});
if
(
status
==
"
False
"
)
{
$
(
"
.ibox-content > table > tbody > tr:nth-child(13) > td:last >b
"
).
html
(
'
True
'
);
$
(
"
.ibox-content > table > tbody > tr:nth-child(13) > td:last >b
"
).
html
(
'
True
'
);
}
else
{
$
(
"
.ibox-content > table > tbody > tr:nth-child(13) > td:last >b
"
).
html
(
'
False
'
);
$
(
"
.ibox-content > table > tbody > tr:nth-child(13) > td:last >b
"
).
html
(
'
False
'
);
}
})
.
on
(
'
click
'
,
'
#btn_add_user_group
'
,
function
()
{
if
(
Object
.
keys
(
jumpserver
.
groups_selected
).
length
===
0
)
{
.
on
(
'
click
'
,
'
#btn_add_user_group
'
,
function
()
{
if
(
Object
.
keys
(
jumpserver
.
groups_selected
).
length
===
0
)
{
return
false
;
}
var
groups
=
$
(
'
.bdg_group
'
).
map
(
function
()
{
return
$
(
this
).
data
(
'
gid
'
);
}).
get
();
$
.
map
(
jumpserver
.
groups_selected
,
function
(
value
,
index
)
{
groups
.
push
(
parseInt
(
index
));
$
(
'
#opt_
'
+
index
).
remove
();
});
updateAssetGroups
(
groups
)
var
groups
=
$
(
'
.bdg_group
'
).
map
(
function
()
{
return
$
(
this
).
data
(
'
gid
'
);
}).
get
();
$
.
map
(
jumpserver
.
groups_selected
,
function
(
value
,
index
)
{
groups
.
push
(
parseInt
(
index
));
$
(
'
#opt_
'
+
index
).
remove
();
});
updateAssetGroups
(
groups
)
})
.
on
(
'
click
'
,
'
.btn_leave_group
'
,
function
()
{
var
$this
=
$
(
this
);
...
...
@@ -391,33 +348,33 @@ $(document).ready(function () {
updateAssetGroups
(
groups
)
})
.
on
(
'
click
'
,
'
.btn-system-user
'
,
function
()
{
if
(
Object
.
keys
(
jumpserver
.
groups_selected
).
length
===
0
)
{
if
(
Object
.
keys
(
jumpserver
.
groups_selected
).
length
===
0
)
{
return
false
;
}
var
system_users
=
$
(
'
.bdg_group
'
).
map
(
function
()
{
return
$
(
this
).
data
(
'
sid
'
);
}).
get
();
$
.
map
(
jumpserver
.
groups_selected
,
function
(
value
,
index
)
{
system_users
.
push
(
parseInt
(
index
));
$
(
'
#opt_
'
+
index
).
remove
();
});
updateAssetSystem
(
system_users
)
var
system_users
=
$
(
'
.bdg_group
'
).
map
(
function
()
{
return
$
(
this
).
data
(
'
sid
'
);
}).
get
();
$
.
map
(
jumpserver
.
groups_selected
,
function
(
value
,
index
)
{
system_users
.
push
(
parseInt
(
index
));
$
(
'
#opt_
'
+
index
).
remove
();
});
updateAssetSystem
(
system_users
)
})
.
on
(
'
click
'
,
'
.btn_leave_system
'
,
function
()
{
var
$this
=
$
(
this
);
var
$tr
=
$this
.
closest
(
'
tr
'
);
var
$badge
=
$tr
.
find
(
'
.bdg_group
'
);
var
sid
=
$badge
.
data
(
'
sid
'
);
var
name
=
$badge
.
html
()
||
$badge
.
text
();
$
(
'
#groups_selected
'
).
append
(
'
<option value="
'
+
sid
+
'
" id="opt_
'
+
sid
+
'
">
'
+
name
+
'
</option>
'
);
$tr
.
remove
();
var
system_users
=
$
(
'
.bdg_group
'
).
map
(
function
()
{
return
$
(
this
).
data
(
'
sid
'
);
}).
get
();
updateAssetSystem
(
system_users
)
.
on
(
'
click
'
,
'
.btn_leave_system
'
,
function
()
{
var
$this
=
$
(
this
);
var
$tr
=
$this
.
closest
(
'
tr
'
);
var
$badge
=
$tr
.
find
(
'
.bdg_group
'
);
var
sid
=
$badge
.
data
(
'
sid
'
);
var
name
=
$badge
.
html
()
||
$badge
.
text
();
$
(
'
#groups_selected
'
).
append
(
'
<option value="
'
+
sid
+
'
" id="opt_
'
+
sid
+
'
">
'
+
name
+
'
</option>
'
);
$tr
.
remove
();
var
system_users
=
$
(
'
.bdg_group
'
).
map
(
function
()
{
return
$
(
this
).
data
(
'
sid
'
);
}).
get
();
updateAssetSystem
(
system_users
)
})
...
...
apps/assets/templates/assets/system_user_list.html
浏览文件 @
e0179ea3
...
...
@@ -26,62 +26,62 @@
</tbody>
</table>
<div
id=
"actions"
class=
"hide"
>
<div
class=
"input-group"
>
<select
class=
"form-control m-b"
style=
"width: auto"
id=
"slct_bulk_update"
>
<option
value=
"delete"
>
{% trans 'Delete selected' %}
</option>
<option
value=
"update"
>
{% trans 'Update selected' %}
</option>
</select>
<div
class=
"input-group-btn pull-left"
style=
"padding-left: 5px;"
>
<button
id=
'btn_bulk_update'
style=
"height: 32px;"
class=
"btn btn-sm btn-primary"
>
{% trans 'Submit' %}
</button>
</div>
</div>
<div
class=
"input-group"
>
<select
class=
"form-control m-b"
style=
"width: auto"
id=
"slct_bulk_update"
>
<option
value=
"delete"
>
{% trans 'Delete selected' %}
</option>
<option
value=
"update"
>
{% trans 'Update selected' %}
</option>
</select>
<div
class=
"input-group-btn pull-left"
style=
"padding-left: 5px;"
>
<button
id=
'btn_bulk_update'
style=
"height: 32px;"
class=
"btn btn-sm btn-primary"
>
{% trans 'Submit' %}
</button>
</div>
</div>
</div>
{% endblock %}
{% block custom_foot_js %}
<script>
$
(
document
).
ready
(
function
(){
var
options
=
{
ele
:
$
(
'
#system_user_list_table
'
),
columnDefs
:
[
{
targets
:
1
,
createdCell
:
function
(
td
,
cellData
,
rowData
)
{
var
detail_btn
=
'
<a href="{% url "assets:system-user-detail" pk=99991937 %}">
'
+
cellData
+
'
</a>
'
;
$
(
td
).
html
(
detail_btn
.
replace
(
'
99991937
'
,
rowData
.
id
));
}},
{
targets
:
5
,
createdCell
:
function
(
td
,
cellData
)
{
var
innerHtml
=
cellData
.
length
>
30
?
cellData
.
substring
(
0
,
30
)
+
'
...
'
:
cellData
;
$
(
td
).
html
(
'
<span href="javascript:void(0);" data-toggle="tooltip" title="
'
+
cellData
+
'
">
'
+
innerHtml
+
'
</span>
'
);
}},
{
targets
:
6
,
createdCell
:
function
(
td
,
cellData
,
rowData
)
{
var
script_btn
=
'
<a href="{% url "assets:system-user-update" pk=99991937 %}" class="btn btn-xs btn-primary">{% trans "Script" %}</a>
'
.
replace
(
'
99991937
'
,
cellData
);
var
update_btn
=
'
<a href="{% url "assets:system-user-update" pk=99991937 %}" class="btn btn-xs m-l-xs btn-info">{% trans "Update" %}</a>
'
.
replace
(
'
99991937
'
,
cellData
);
var
del_btn
=
'
<a class="btn btn-xs btn-danger m-l-xs btn_admin_user_delete" data-uid="99991937">{% trans "Delete" %}</a>
'
.
replace
(
'
99991937
'
,
cellData
);
$
(
td
).
html
(
script_btn
+
update_btn
+
del_btn
)
}}],
ajax_url
:
'
{% url "api-assets:system-user-list" %}
'
,
columns
:
[{
data
:
"
id
"
},
{
data
:
"
name
"
},
{
data
:
"
username
"
},
{
data
:
"
assets_amount
"
},
{
data
:
function
()
{
return
"
3
"
}},
{
data
:
"
comment
"
},
{
data
:
"
id
"
}],
op_html
:
$
(
'
#actions
'
).
html
()
var
options
=
{
ele
:
$
(
'
#system_user_list_table
'
),
columnDefs
:
[
{
targets
:
1
,
createdCell
:
function
(
td
,
cellData
,
rowData
)
{
var
detail_btn
=
'
<a href="{% url "assets:system-user-detail" pk=99991937 %}">
'
+
cellData
+
'
</a>
'
;
$
(
td
).
html
(
detail_btn
.
replace
(
'
99991937
'
,
rowData
.
id
));
}},
{
targets
:
5
,
createdCell
:
function
(
td
,
cellData
)
{
var
innerHtml
=
cellData
.
length
>
30
?
cellData
.
substring
(
0
,
30
)
+
'
...
'
:
cellData
;
$
(
td
).
html
(
'
<span href="javascript:void(0);" data-toggle="tooltip" title="
'
+
cellData
+
'
">
'
+
innerHtml
+
'
</span>
'
);
}},
{
targets
:
6
,
createdCell
:
function
(
td
,
cellData
,
rowData
)
{
{
#
var
script_btn
=
'
<a href="{% url "assets:system-user-update" pk=99991937 %}" class="btn btn-xs btn-primary">{% trans "Script" %}</a>
'
.
replace
(
'
99991937
'
,
cellData
);
#
}
var
update_btn
=
'
<a href="{% url "assets:system-user-update" pk=99991937 %}" class="btn btn-xs m-l-xs btn-info">{% trans "Update" %}</a>
'
.
replace
(
'
99991937
'
,
cellData
);
var
del_btn
=
'
<a class="btn btn-xs btn-danger m-l-xs btn_admin_user_delete" data-uid="99991937">{% trans "Delete" %}</a>
'
.
replace
(
'
99991937
'
,
cellData
);
$
(
td
).
html
(
update_btn
+
del_btn
)
}}],
ajax_url
:
'
{% url "api-assets:system-user-list" %}
'
,
columns
:
[{
data
:
"
id
"
},
{
data
:
"
name
"
},
{
data
:
"
username
"
},
{
data
:
"
assets_amount
"
},
{
data
:
function
()
{
return
"
3
"
}},
{
data
:
"
comment
"
},
{
data
:
"
id
"
}],
op_html
:
$
(
'
#actions
'
).
html
()
};
jumpserver
.
initDataTable
(
options
);
jumpserver
.
initDataTable
(
options
);
})
.
on
(
'
click
'
,
'
.btn_admin_user_delete
'
,
function
()
{
var
$this
=
$
(
this
);
var
$data_table
=
$
(
'
#idc_list_table
'
).
DataTable
();
var
name
=
$
(
this
).
closest
(
"
tr
"
).
find
(
"
:nth-child(2)
"
).
children
(
'
a
'
).
html
();
var
uid
=
$this
.
data
(
'
uid
'
);
var
the_url
=
'
{% url "api-assets:system-user-detail" pk=99991937 %}
'
.
replace
(
'
99991937
'
,
uid
);
objectDelete
(
$this
,
name
,
the_url
);
setTimeout
(
function
()
{
var
$this
=
$
(
this
);
var
$data_table
=
$
(
'
#idc_list_table
'
).
DataTable
();
var
name
=
$
(
this
).
closest
(
"
tr
"
).
find
(
"
:nth-child(2)
"
).
children
(
'
a
'
).
html
();
var
uid
=
$this
.
data
(
'
uid
'
);
var
the_url
=
'
{% url "api-assets:system-user-detail" pk=99991937 %}
'
.
replace
(
'
99991937
'
,
uid
);
objectDelete
(
$this
,
name
,
the_url
);
setTimeout
(
function
()
{
$data_table
.
ajax
.
reload
();
},
3000
);
})
.
on
(
'
click
'
,
'
#btn_bulk_update
'
,
function
()
{
var
action
=
$
(
'
#slct_bulk_update
'
).
val
();
var
$data_table
=
$
(
'
#system_user_list_table
'
).
DataTable
();
var
action
=
$
(
'
#slct_bulk_update
'
).
val
();
var
$data_table
=
$
(
'
#system_user_list_table
'
).
DataTable
();
var
id_list
=
[];
var
plain_id_list
=
[];
$data_table
.
rows
({
selected
:
true
}).
every
(
function
(){
...
...
@@ -118,17 +118,17 @@ $(document).ready(function(){
});
}
function
doUpdate
()
{
{
#
TODO
:
bulk
update
the
System
Users
#
}
{
#
TODO
:
bulk
update
the
System
Users
#
}
}
switch
(
action
)
{
case
'
delete
'
:
doDelete
();
break
;
case
'
update
'
:
doUpdate
();
break
;
default
:
break
;
case
'
delete
'
:
doDelete
();
break
;
case
'
update
'
:
doUpdate
();
break
;
default
:
break
;
}
})
</script>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录