Merge group env into device live settings api response

FlowFuse · Oct 18, 2024 · 3790772 · 3790772
1 parent dc4f010
commit 3790772
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/forge/routes/api/deviceLive.js b/forge/routes/api/deviceLive.js
@@ -217,7 +217,9 @@ module.exports = async function (app) {
             hash: request.device.settingsHash,
             env: {}
         }
-        const settings = await request.device.getAllSettings()
+        const settings = await request.device.getAllSettings({
+            mergeDeviceGroupSettings: true
+        })
         Object.keys(settings).forEach(key => {
             if (key === 'env') {
                 settings.env.forEach(envVar => {