github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-06 09:51:00 +00:00
Code Issues Projects Releases Wiki Activity

[Update] Merge with dev

Browse Source
This commit is contained in:
ibuler
2019-10-23 15:25:06 +08:00
parent 792fc3b0f0 f802fb645d
commit d5cb0a2e59
41 changed files with 308 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/static/js/jumpserver.js
View File

@@ -206,7 +206,7 @@ function formSubmit(props) {
var errors = jqXHR.responseJSON;
var noneFieldErrorRef = props.form.children('.alert-danger');
if (noneFieldErrorRef.length !== 1) {
props.form.prepend('<div class="alert alert-danger" style="display: none"></div>');
props.form.prepend('<div class="alert alert-danger has-error" style="display: none"></div>');
noneFieldErrorRef = props.form.children('.alert-danger');
}
var noneFieldErrorMsg = "";
@@ -252,6 +252,7 @@ function formSubmit(props) {
noneFieldErrorRef.css('display', 'block');
noneFieldErrorRef.html(noneFieldErrorMsg);
}
$('.has-error').get(0).scrollIntoView();
}
})
@@ -458,6 +459,7 @@ jumpserver.initDataTable = function (options) {
{
targets: 0,
orderable: false,
width: "20px",
createdCell: function (td, cellData) {
$(td).html('<input type="checkbox" class="text-center ipt_check" id=99991937>'.replace('99991937', cellData));
}
@@ -555,6 +557,7 @@ jumpserver.initServerSideDataTable = function (options) {
{
targets: 0,
orderable: false,
width: "20px",
createdCell: function (td, cellData) {
$(td).html('<input type="checkbox" class="text-center ipt_check" id=99991937>'.replace('99991937', cellData));
}