Merge branch 'optimize' into dev4

* optimize: luci-app-oaf: fix text # Conflicts: # luci-app-oaf/Makefile
jjm2473 · Mar 18, 2024 · d5c31b5 · d5c31b5
2 parents a72e1ea + 047cbb1
commit d5c31b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/luci-app-oaf/Makefile b/luci-app-oaf/Makefile
@@ -9,7 +9,7 @@ LUCI_TITLE:=Open App Filter Module
 LUCI_PKGARCH:=all
 LUCI_DEPENDS:=+appfilter +kmod-oaf  +luci-compat
 PKG_NAME:=luci-app-oaf
-PKG_VERSION:=5.0.5
+PKG_VERSION:=5.0.6
 PKG_RELEASE:=
 include $(TOPDIR)/feeds/luci/luci.mk
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-oaf/luasrc/view/oaf/dev_status.htm b/luci-app-oaf/luasrc/view/oaf/dev_status.htm
@@ -371,7 +371,7 @@
                 <%:Hostname%>
             </th>
             <th class="th">
-                <%:Mac%>
+                <%:MAC%>
             </th>
             <th class="th">
                 <%:Start Time%>

diff --git a/luci-app-oaf/luasrc/view/oaf/user_status.htm b/luci-app-oaf/luasrc/view/oaf/user_status.htm
@@ -82,10 +82,10 @@
 					<%:Hostname%>
 				</th>
 				<th class="th">
-					<%:Mac%>
+					<%:MAC%>
 				</th>
 				<th class="th">
-					<%:Ip%>
+					<%:IP%>
 				</th>
 				<th class="th">
 					<%:Common App(TOP5)%>