-{# 系统用户是 Jumpserver跳转登录资产时使用的用户，可以理解为登录资产用户，如 web, sa, dba(`ssh web@some-host`), 而不是使用某个用户的用户名跳转登录服务器(`ssh xiaoming@some-host`);#}
-{# 简单来说是 用户使用自己的用户名登录Jumpserver, Jumpserver使用系统用户登录资产。#}
-{# 系统用户创建时，如果选择了自动推送 Jumpserver会使用ansible自动推送系统用户到资产中，如果资产(交换机、windows)不支持ansible, 请手动填写账号密码。#}
-{# 目前还不支持Windows的自动推送#}
{% trans 'System user is Jumpserver jump login assets used by the users, can be understood as the user login assets, such as web, sa, the dba (` ssh web@some-host `), rather than using a user the username login server jump (` ssh xiaoming@some-host `); '%}
{% trans 'In simple terms, users log into Jumpserver using their own username, and Jumpserver uses system users to log into assets. '%}
{% trans 'When system users are created, if you choose auto push Jumpserver to use Ansible push system users into the asset, if the asset (Switch) does not support ansible, please manually fill in the account password.' %}
@@ -91,7 +87,7 @@ function initTable() {
columns: [
{data: "id" }, {data: "name" }, {data: "username" }, {data: "protocol"},
{data: "login_mode"}, {data: "assets_amount", orderable: false },
- {data: "comment" }, {data: "id", orderable: false }
+ {data: "comment" }, {data: "id", orderable: false, width: "100px"}
],
op_html: $('#actions').html()
};
diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html
index 2a493e16b..18e30bde8 100644
--- a/apps/perms/templates/perms/asset_permission_list.html
+++ b/apps/perms/templates/perms/asset_permission_list.html
@@ -190,7 +190,7 @@ function initTable() {
{data: "id"}, {data: "name"}, {data: "users", orderable: false},
{data: "user_groups", orderable: false}, {data: "assets", orderable: false},
{data: "nodes", orderable: false}, {data: "system_users", orderable: false},
- {data: "is_valid", orderable: false}, {data: "id", orderable: false}
+ {data: "is_valid", orderable: false}, {data: "id", orderable: false, width: "100px"}
],
select: {},
op_html: $('#actions').html()
diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index 4f55cfb4f..4dceb01bf 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -201,7 +201,7 @@ function formSubmit(props) {
var errors = jqXHR.responseJSON;
var noneFieldErrorRef = props.form.children('.alert-danger');
if (noneFieldErrorRef.length !== 1) {
- props.form.prepend('
');
+ props.form.prepend('
');
noneFieldErrorRef = props.form.children('.alert-danger');
}
var noneFieldErrorMsg = "";
@@ -247,6 +247,7 @@ function formSubmit(props) {
noneFieldErrorRef.css('display', 'block');
noneFieldErrorRef.html(noneFieldErrorMsg);
}
+ $('.has-error').get(0).scrollIntoView();
}
})
@@ -453,6 +454,7 @@ jumpserver.initDataTable = function (options) {
{
targets: 0,
orderable: false,
+ width: "20px",
createdCell: function (td, cellData) {
$(td).html('
'.replace('99991937', cellData));
}
@@ -550,6 +552,7 @@ jumpserver.initServerSideDataTable = function (options) {
{
targets: 0,
orderable: false,
+ width: "20px",
createdCell: function (td, cellData) {
$(td).html('
'.replace('99991937', cellData));
}
diff --git a/apps/users/templates/users/user_group_list.html b/apps/users/templates/users/user_group_list.html
index c2fa87357..3eb70e319 100644
--- a/apps/users/templates/users/user_group_list.html
+++ b/apps/users/templates/users/user_group_list.html
@@ -82,7 +82,7 @@ function initTable() {
],
ajax_url: '{% url "api-users:user-group-list" %}?display=1',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "users", orderable: false},
- {data: "comment"}, {data: "id", orderable: false }],
+ {data: "comment"}, {data: "id", orderable: false, width:"100px"}],
order: [],
op_html: $('#actions').html()
};
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
index d992416d1..cd9273681 100644
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -125,7 +125,7 @@ function initTable() {
{data: "groups_display", orderable: false},
{data: "source"},
{data: "is_valid", orderable: false},
- {data: "id", orderable: false}
+ {data: "id", orderable: false, width: "100px"}
],
op_html: $('#actions').html()
};