diff --git a/route/files.py b/route/files.py index df02333c7..81ef8f7e4 100644 --- a/route/files.py +++ b/route/files.py @@ -25,9 +25,7 @@ def GetDiskInfo(): @files.route('/GetExecLog', methods=['POST']) def GetExecLog(): - file = os.getcwd() + "/tmp/panelExec.log" - print file v = public.getLastLine(file, 100) return v diff --git a/static/js/soft.js b/static/js/soft.js index 3656ca2a5..193b5ba71 100755 --- a/static/js/soft.js +++ b/static/js/soft.js @@ -1765,7 +1765,7 @@ function GetSList(isdisplay) { var condition = (search + type + page).slice(1); $.post('/plugins/list?' + condition, '', function(rdata) { - console.log(rdata); + //console.log(rdata); layer.close(loadT); var tBody = ''; var sBody = ''; @@ -1795,10 +1795,15 @@ function GetSList(isdisplay) { var checked = ''; checked = rdata.data[i].display ? 'checked' : ''; - for (var j = 0; j < len; j++) { - if (rdata.data[i].versions[j].status) continue; - version_info += rdata.data[i].versions[j].version + '|'; - // console.log(version_info,rdata.data[i].versions[j].status); + console.log(rdata.data[0]); + + if (typeof rdata.data[i].versions == "string"){ + version_info += rdata.data[i].versions + '|'; + } else { + for (var j = 0; j < len; j++) { + if (rdata.data[i].versions[j].status) continue; + version_info += rdata.data[i].versions[j].version + '|'; + } } if (version_info != '') { version_info = version_info.substring(0, version_info.length - 1);