diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py index 6ba8b5e70..9051050c9 100644 --- a/web/admin/crontab/__init__.py +++ b/web/admin/crontab/__init__.py @@ -88,7 +88,7 @@ def modify_crond(): request_data['stype'] = request.form.get('stype', '') request_data['sname'] = request.form.get('sname', '') request_data['sbody'] = request.form.get('sbody', '') - request_data['url_address'] = request.form.get('urladdress', '') + request_data['url_address'] = request.form.get('url_address', '') cron_id = request.form.get('id', '') data = MwCrontab.instance().modifyCrond(cron_id,request_data) return data diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js index c581f8cc9..e1ed4b067 100755 --- a/web/static/app/crontab.js +++ b/web/static/app/crontab.js @@ -283,16 +283,16 @@ function planAdd(){ } } - var urladdress = $("#urladdress").val(); + var url_address = $("#url_address").val(); if(sType == 'toUrl'){ - if(!isURL(urladdress)){ + if(!isURL(url_address)){ layer.msg('URL地址不正确!',{icon:2}); - $("implement textarea[name='urladdress']").focus(); + $("implement textarea[name='url_address']").focus(); return; } } - // urladdress = encodeURIComponent(urladdress); - $("#cronConfig input[name='urladdress']").val(urladdress); + // url_address = encodeURIComponent(url_address); + $("#cronConfig input[name='url_address']").val(url_address); $("#cronConfig input[name='stype']").val(sType); $("#cronConfig textarea[name='sbody']").val(decodeURIComponent(sBody)); @@ -669,7 +669,7 @@ function editTaskInfo(id){ sname: rdata.sname, backup_to: rdata.backup_to, save: rdata.save, - urladdress: rdata.urladdress, + url_address: rdata.url_address, }, sTypeArray:[['toShell','Shell脚本'],['site','备份网站'],['database','备份数据库'],['logs','日志切割'],['path','备份目录'],['rememory','释放内存'],['toUrl','访问URL']], cycleArray:[['day','每天'],['day-n','N天'],['hour','每小时'],['hour-n','N小时'],['minute-n','N分钟'],['week','每星期'],['month','每月']], @@ -814,7 +814,7 @@ function editTaskInfo(id){ \
\ URL地址\ -
\ +
\
\
\
保存编辑
\ @@ -868,7 +868,7 @@ function editTaskInfo(id){ obj.from.sbody = $(this).val(); }); $('.url_create').blur(function () { - obj.from.urladdress = $(this).val(); + obj.from.url_address = $(this).val(); }); $('[aria-labelledby="cycle"] a').unbind().click(function () { @@ -1070,7 +1070,7 @@ function toShell(){ //从脚本 function toUrl(){ - var tBody = ""; + var tBody = ""; $("#implement").html(tBody); $(".planname input[name='name']").removeAttr('readonly style').val(""); } diff --git a/web/templates/default/crontab.html b/web/templates/default/crontab.html index 3cc44f723..420655449 100755 --- a/web/templates/default/crontab.html +++ b/web/templates/default/crontab.html @@ -108,7 +108,7 @@ - + diff --git a/web/utils/crontab.py b/web/utils/crontab.py index 5670a327b..9e0d37b73 100644 --- a/web/utils/crontab.py +++ b/web/utils/crontab.py @@ -474,7 +474,7 @@ fi''' % (mw.getPanelDir(),) shell = wheres[stype] except: if stype == 'toUrl': - shell = head + "curl -sS --connect-timeout 10 -m 60 '" + param['urladdress'] + "'" + shell = head + "curl -sS --connect-timeout 10 -m 60 '" + param['url_address'] + "'" else: shell = head + param['sbody'].replace("\r\n", "\n")