rufengsuixing 5 years ago
parent
commit
7fd5c8ffc6

+ 2 - 2
luasrc/controller/AdGuardHome.lua

@@ -1,6 +1,6 @@
 module("luci.controller.AdGuardHome",package.seeall)
 module("luci.controller.AdGuardHome",package.seeall)
-local fs=require"fs"
-local http=require"http"
+local fs=require"nixio.fs"
+local http=require"luci.http"
 local uci=require"luci.model.uci".cursor()
 local uci=require"luci.model.uci".cursor()
 function index()
 function index()
 entry({"admin", "services", "AdGuardHome"},alias("admin", "services", "AdGuardHome", "base"),_("AdGuard Home"), 10).dependent = true
 entry({"admin", "services", "AdGuardHome"},alias("admin", "services", "AdGuardHome", "base"),_("AdGuard Home"), 10).dependent = true

+ 1 - 1
luasrc/model/cbi/AdGuardHome/base.lua

@@ -52,7 +52,7 @@ end
 o=s:option(Button,"restart",translate("Update"))
 o=s:option(Button,"restart",translate("Update"))
 o.inputtitle=translate("Update core version")
 o.inputtitle=translate("Update core version")
 o.template = "AdGuardHome/AdGuardHome_check"
 o.template = "AdGuardHome/AdGuardHome_check"
-if fs.access(configpath)
+if fs.access(configpath) then
 o.showfastconfig=false
 o.showfastconfig=false
 else
 else
 o.showfastconfig=true
 o.showfastconfig=true

+ 8 - 11
luasrc/view/AdGuardHome/AdGuardHome_check.htm

@@ -1,5 +1,5 @@
 <%+cbi/valueheader%>
 <%+cbi/valueheader%>
-<%fs=require"nixio.fs"%>
+<%local fs=require"nixio.fs"%>
 <input type="button" class="cbi-button cbi-button-apply" id="apply_update_button" value="<%:Update core version%>" onclick=" return apply_update() "/>
 <input type="button" class="cbi-button cbi-button-apply" id="apply_update_button" value="<%:Update core version%>" onclick=" return apply_update() "/>
 <% if self.showfastconfig then %>
 <% if self.showfastconfig then %>
 <input type="button" class="cbi-button cbi-button-apply" id="to_configpage" value="<%:Fast config%>" onclick="location.href='<%=url([[admin]], [[services]], [[AdGuardHome]], [[manual]])%>'"/>
 <input type="button" class="cbi-button cbi-button-apply" id="to_configpage" value="<%:Fast config%>" onclick="location.href='<%=url([[admin]], [[services]], [[AdGuardHome]], [[manual]])%>'"/>
@@ -22,17 +22,14 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[check]])%>', nul
 	function(x, data) {
 	function(x, data) {
 		var lv = document.getElementById('cbid.logview.1.conf');
 		var lv = document.getElementById('cbid.logview.1.conf');
 		if (x.responseText && lv) {
 		if (x.responseText && lv) {
-			if (x.responseText=="\u0000")
-			{
+			if (x.responseText=="\u0000"){
 				for(j = 0,len=this.XHR._q.length; j < len; j++) {
 				for(j = 0,len=this.XHR._q.length; j < len; j++) {
-				if (this.XHR._q[j].url == '<%=url([[admin]], [[services]], [[AdGuardHome]], [[check]])%>')
-				{
-				this.XHR._q.splice(j,1);
-				var	btn = document.getElementById('apply_update_button');
-				btn.disabled = false;
-				btn.value    = '<%:Updated%>';
-				document.getElementById('updateversion').innerText='<%=uci:get("AdGuardHome","AdGuardHome","version")%>'
-				}
+					if (this.XHR._q[j].url == '<%=url([[admin]], [[services]], [[AdGuardHome]], [[check]])%>'){
+					this.XHR._q.splice(j,1);
+					var	btn = document.getElementById('apply_update_button');
+					btn.disabled = false;
+					btn.value    = '<%:Updated%>';
+					}
 				}
 				}
 				return	
 				return	
 			}
 			}