Revert "luci-app-mwan3: delete additional mwan3 load call"

This commit introduces a regression, so that in the policy, rule and member
pages, the dropdowns are not filled with the required configuration options
from the mwan3 configuration. Reverting the commit resolves the issue and
the dropdowns are filled with values again.

Fixes: #8232
This reverts commit 1243d8023aaaf29a7cb750e104b5e96ec3689544.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

diff --git a/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/member.js b/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/member.js
index 383ee59b5ef2dc1140948a1924da7328826bb543..814d1401a4e79be052f486848293adeb0eaf0c60 100644 (file)
--- a/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/member.js
+++ b/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/member.js
@@ -5,6 +5,11 @@
 'require ui';
 
 return view.extend({
+       load: function() {
+               return Promise.all([
+                       uci.load('mwan3')
+               ]);
+       },
 
        render: function () {
                let m, s, o;

diff --git a/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/policy.js b/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/policy.js
index 6c1ef219e59340ef2846f91bfaa797ad42706574..73ab7b746964d8a0881bd41a49e153ffa5b7a05c 100644 (file)
--- a/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/policy.js
+++ b/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/policy.js
@@ -5,6 +5,11 @@
 'require ui';
 
 return view.extend({
+       load: function() {
+               return Promise.all([
+                       uci.load('mwan3')
+               ]);
+       },
 
        render: function () {
                let m, s, o;

diff --git a/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/rule.js b/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/rule.js
index 833bb2b193df09aee45f78a040703f399af4d064..a6523ec2e9c0cf568e01389d988d1a952ee79348 100644 (file)
--- a/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/rule.js
+++ b/applications/luci-app-mwan3/htdocs/luci-static/resources/view/mwan3/network/rule.js
@@ -8,7 +8,8 @@
 return view.extend({
        load: function() {
                return Promise.all([
-                       fs.exec_direct('/usr/libexec/luci-mwan3', ['ipset', 'dump'])
+                       fs.exec_direct('/usr/libexec/luci-mwan3', ['ipset', 'dump']),
+                       uci.load('mwan3')
                ]);
        },