diff --git a/class/core/crontab_api.py b/class/core/crontab_api.py index 511e9c89b..b45b64ebb 100755 --- a/class/core/crontab_api.py +++ b/class/core/crontab_api.py @@ -378,14 +378,14 @@ class crontab_api: bak_data = [] - if stype == 'sites' or stype == 'database': + if stype == 'sites' or stype == 'database' or stype.find('database_') > -1: hookPath = mw.getPanelDataDir() + "/hook_backup.json" if os.path.exists(hookPath): t = mw.readFile(hookPath) bak_data = json.loads(t) sqlite3_name = 'mysql' - if stype == 'database' or stype == 'database_mariadb' or stype == 'database_mysql-apt' or stype == 'database_mysql-yum' or stype == 'database_postgresql': + if stype == 'database' or stype.find('database_') > -1: path = mw.getServerDir() + '/mysql' if stype != 'database': soft_name = stype.replace('database_', '') diff --git a/route/static/app/crontab.js b/route/static/app/crontab.js index 06d074ee0..21d63572c 100755 --- a/route/static/app/crontab.js +++ b/route/static/app/crontab.js @@ -534,11 +534,17 @@ function editTaskInfo(id){ sNameArray:[], backupsArray:[], create:function(callback){ - for(var i = 0; i -1){ + name = obj.from['stype'].replace('database_',''); + sTypeName = '备份数据库['+name+']'; + sTypeDom += '
  • '+ sTypeName +'
  • '; + } else { + for(var i = 0; i '+ obj['sTypeArray'][i][1] +''; } - sTypeDom += '
  • '+ obj['sTypeArray'][i][1] +'
  • '; } for(var i = 0; i '+ obj['weekArray'][i][1] +''; } - if(obj.from.stype == 'site' || obj.from.stype == 'database' || obj.from.stype == 'path' || obj.from.stype == 'logs'){ - $.post('/crontab/get_data_list',{type:obj.from.stype == 'databases'?'database':'sites'},function(rdata){ + if(obj.from.stype == 'site' || obj.from.stype == 'database' || obj.from.stype == 'path' || obj.from.stype == 'logs' || obj.from['stype'].indexOf('database_')>-1){ + $.post('/crontab/get_data_list',{type:obj.from.stype},function(rdata){ // console.log(rdata); obj.sNameArray = rdata.data; obj.sNameArray.unshift({name:'ALL',ps:'所有'});