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

Merge remote-tracking branch 'origin/master' into ops_dev

Browse Source 
# Conflicts:
#	requirements.txt
This commit is contained in:
yumaojun03
2016-12-19 23:55:54 +08:00
parent 47d87e38a6 87eed2e59b
commit 046c7e21e9
44 changed files with 845 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,9 +214,7 @@ function APIUpdateAttr(props) {
// Sweet Alert for Delete
function objectDelete(obj, name, url) {
var $this = $(this);
function doDelete() {
var uid = $this.data('uid');
var body = {};
var success = function() {
swal('Deleted!', "[ "+name+"]"+" has been deleted ", "success");
@@ -292,7 +290,7 @@ jumpserver.initDataTable = function (options) {
columnDefs = options.columnDefs ? options.columnDefs.concat(columnDefs) : columnDefs;
var table = ele.DataTable({
pageLength: options.pageLength || 15,
dom: options.dom || '<"#uc.pull-left"><"html5buttons"B>flti<"row m-t"<"#op.col-md-6"><"col-md-6"p>>',
dom: options.dom || '<"#uc.pull-left">flt<"row m-t"<"col-md-8"<"#op.col-md-6"><"col-md-6 text-center"i>><"col-md-4"p>>',
language: {
url: options.i18n_url || "/static/js/plugins/dataTables/i18n/zh-hans.json"
},