From ad541216c55e4da5477bec2ed0aa20c6317e743b Mon Sep 17 00:00:00 2001 From: midoks Date: Sat, 18 Feb 2023 16:59:33 +0800 Subject: [PATCH] up --- plugins/migration_api/index.py | 18 ++++++++++++++++++ plugins/migration_api/js/app.js | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py index 47de16358..7851879ae 100755 --- a/plugins/migration_api/index.py +++ b/plugins/migration_api/index.py @@ -128,6 +128,7 @@ def writeConf(data): def getArgs(): args = sys.argv[2:] tmp = {} + # print(args) args_len = len(args) if args_len == 1: t = args[0].strip('{').strip('}') @@ -138,7 +139,9 @@ def getArgs(): tmp[t[0]] = t[1] tmp[t[0]] = t[1] elif args_len > 1: + for i in range(len(args)): + # print(args[i]) t = args[i].split(':', 1) tmp[t[0]] = t[1] return tmp @@ -255,6 +258,21 @@ def stepThree(): def stepFour(): + args = getArgs() + data = checkArgs(args, ['sites', 'databases']) + if not data[0]: + return data[1] + + sites = args['sites'] + databases = args['databases'] + + data = getCfgData() + ready_data = { + 'sites': sites.strip(',').split(','), + 'databases': databases.strip(',').split(',') + } + data['ready'] = ready_data + writeConf(data) return mw.returnJson(True, 'ok') if __name__ == "__main__": diff --git a/plugins/migration_api/js/app.js b/plugins/migration_api/js/app.js index 07dfb29fe..9bbc0c2bf 100755 --- a/plugins/migration_api/js/app.js +++ b/plugins/migration_api/js/app.js @@ -189,9 +189,19 @@ function initStep3(){ }); } -// function initStep4(){ - maPost('step_four',{}, function(rdata){ + + var site_checked = ''; + $('input[name="sites"]:checked').each(function(){ + site_checked += $(this).val()+','; + }); + + var databases_checked = ''; + $('input[name="databases"]').each(function(){ + databases_checked+=$(this).val()+','; + }); + + maPost('step_four',{sites:site_checked,databases:databases_checked}, function(rdata){ var rdata = $.parseJSON(rdata.data); var tby = '
\