Merge branch 'optimize' into dev4

* optimize: luci-app-oaf: fix uci update flag not commit after feature file uploaded # Conflicts: # luci-app-oaf/Makefile
jjm2473 · Mar 15, 2024 · c7d9802 · c7d9802
2 parents ced1b40 + e5cfce9
commit c7d9802
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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.4
+PKG_VERSION:=5.0.5
 PKG_RELEASE:=
 include $(TOPDIR)/feeds/luci/luci.mk
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-oaf/luasrc/model/cbi/appfilter/feature.lua b/luci-app-oaf/luasrc/model/cbi/appfilter/feature.lua
@@ -81,6 +81,7 @@ http.setfilehandler(function(meta, chunk, eof)
             os.execute("chmod 666 " .. feature_file);
             os.execute("rm /tmp/appfilter -fr");
             os.execute("uci set appfilter.feature.update=1");
+            os.execute("uci commit appfilter");
             luci.sys.exec("/etc/init.d/appfilter restart");
             um.value = translate("Update the feature file successfully, please refresh the page")
         else