Revert "luci-base: force menu to regenerate after uci change"

This reverts commit 97ebdcbddb9cad76dc551086fcb887e55886a069.

The commit seems to cause errors already before the login screen.
Discussion in https://github.com/openwrt/luci/commit/97ebdcbddb9cad76dc551086fcb887e55886a069#commitcomment-139871175

Errors like:

 In error(), file [C]
 called from function [anonymous function] (/usr/lib/lua/luci/ucodebridge.lua:23)
 called from function ((tail call))
 In [anonymous function](), file /usr/share/ucode/luci/runtime.uc, line 148, byte 45:
   called from function build_pagetree (/usr/share/ucode/luci/dispatcher.uc:382:73)
   called from function menu_json (/usr/share/ucode/luci/dispatcher.uc:439:26)
   called from function [anonymous function] (/usr/share/ucode/luci/dispatcher.uc:898:24)
   called from anonymous function (/www/cgi-bin/luci:39:13)

  `        return lcall.call(modname, method, ...args);`
   Near here ----------------------------------------^

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/modules/luci-base/htdocs/luci-static/resources/uci.js b/modules/luci-base/htdocs/luci-static/resources/uci.js
index c56ce4016a243f78d562b8a8459e81f2369cfb57..76b274470b19dd6c9698e95b341b80e48b92be3a 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/uci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/uci.js
@@ -919,8 +919,6 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
                                                        window.setTimeout(try_confirm, 250);
                                                else
                                                        return Promise.reject(rv);
-                                       } else {
-                                               document.dispatchEvent(new CustomEvent('uci-applied'));
                                        }
 
                                        return rv;

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index b17fdc45fe1ed720c222321800b435939839c71d..afb590d8f8a50048602b7c731dc0f30a13b7f65e 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -3478,10 +3478,6 @@ var UITable = baseclass.extend(/** @lends LuCI.ui.table.prototype */ {
        }
 });
 
-// Because the menu can depend on uci values, we need to flush the cache
-// after uci mutations.
-document.addEventListener('uci-applied', () => UIMenu.flushCache());
-
 /**
  * @class ui
  * @memberof LuCI

diff --git a/modules/luci-base/ucode/dispatcher.uc b/modules/luci-base/ucode/dispatcher.uc
index 694891a90e6aad25b451b8b91dd9ddea37236062..8717385be2170e8eeb41f5f23fce2f1864a9c2d4 100644 (file)
--- a/modules/luci-base/ucode/dispatcher.uc
+++ b/modules/luci-base/ucode/dispatcher.uc
@@ -358,7 +358,7 @@ function build_pagetree() {
                firstchild_ineligible: 'bool'
        };
 
-       let files = glob('/usr/share/luci/menu.d/*.json', '/etc/config/*', '/usr/lib/lua/luci/controller/*.lua', '/usr/lib/lua/luci/controller/*/*.lua');
+       let files = glob('/usr/share/luci/menu.d/*.json', '/usr/lib/lua/luci/controller/*.lua', '/usr/lib/lua/luci/controller/*/*.lua');
        let cachefile;
 
        if (indexcache) {