diff --git a/class/core/plugin_api.py b/class/core/plugin_api.py index a610e98ff..1d5a3af09 100755 --- a/class/core/plugin_api.py +++ b/class/core/plugin_api.py @@ -87,7 +87,6 @@ class plugin_api: def getVersion(self, path): version_f = path + '/version.pl' - print version_f if os.path.exists(version_f): return public.readFile(version_f).strip() return '' diff --git a/class/core/system_api.py b/class/core/system_api.py index b09ebbd67..ee814fb64 100755 --- a/class/core/system_api.py +++ b/class/core/system_api.py @@ -625,10 +625,11 @@ class system_api: # 重启面板 def reWeb(self, get): - # if not public.IsRestart(): return - # public.returnMsg(False,'EXEC_ERR_TASK'); + if not public.isRestart(): + public.returnMsg(False, '请等待所有安装任务完成再执行!') + # public.ExecShell('/etc/init.d/bt restart &') - return True + public.returnMsg(True, '执行成功!') # 修复面板 def repPanel(self, get): diff --git a/static/js/public.js b/static/js/public.js index 665b27d08..d7accce02 100755 --- a/static/js/public.js +++ b/static/js/public.js @@ -875,7 +875,7 @@ function setSelectChecked(c, d) { } } } -GetTaskCount(); +getTaskCount(); function RecInstall() { $.post("/ajax?action=GetSoftList", "", function(l){ var c = "";