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

[Bugfix] requirements 添加openssh-cleints

pull/828/merge
ibuler 2017-12-28 16:06:07 +08:00
parent b6b0d6a9be
commit 69f723c8f5
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/tasks.py
View File

@ -34,7 +34,7 @@ def update_assets_hardware_info(result, **kwargs):
"""
result_raw = result[0]
assets_updated = []
for hostname, info in result_raw['ok'].items():
for hostname, info in result_raw.get('ok', {}).items():
if info:
info = info[const.UPDATE_ASSETS_HARDWARE_TASK_NAME]['ansible_facts']
else:

3
apps/assets/templates/assets/admin_user_detail.html
View File

@ -157,7 +157,8 @@ function bindToCluster(clusters) {
jumpserver.cluster_selected = {};
$(document).ready(function () {
$('.select2').select2();.on('select2:select', function(evt) {
$('.select2').select2()
.on('select2:select', function(evt) {
var data = evt.params.data;
jumpserver.cluster_selected[data.id] = data.text;
}).on('select2:unselect', function(evt) {

2
requirements/rpm_requirements.txt
View File

@ -1 +1 @@
libtiff-devel libjpeg-devel libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel sshpass openldap-devel mysql-devel libffi-devel
libtiff-devel libjpeg-devel libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel sshpass openldap-devel mysql-devel libffi-devel openssh-clients