[req-changes] Fixed JS issue

openwisp · Jul 13, 2023 · d8563c3 · d8563c3
1 parent 8ba464f
commit d8563c3
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/openwisp_controller/config/static/config/js/widget.js b/openwisp_controller/config/static/config/js/widget.js
@@ -37,8 +37,14 @@
                     // If the contextValue was set by a template or group, then
                     // override the value.
                     (prevDefaultValues.hasOwnProperty(key) && prevDefaultValues[key] !== defaultValues[key]) ||
-                    // Gives precedence to device's context (saved in database) and SystemContextValue
-                    (!contextValue.hasOwnProperty(key) && !systemContextValue.hasOwnProperty(key))
+                    // Gives precedence to device's context (saved in database)
+                    (!contextValue.hasOwnProperty(key) &&
+                        // Gives precedence to systemContextValue.
+                        // But if the default value is equal to the system context value,
+                        // then add the variable in the contextValue. This allows users
+                        // to override the value.
+                        (!systemContextValue.hasOwnProperty(key) || systemContextValue[key] === defaultValues[key])
+                    )
                 ) {
                     contextValue[key] = defaultValues[key];
                 }