libs/cbi: Added "Save & Apply" button to CBI forms

diff --git a/i18n/english/luasrc/i18n/cbi.en.lua b/i18n/english/luasrc/i18n/cbi.en.lua
index 14153989fbd467825ee29d5954ca9adeaadeac88..4cebd24883abb79408282d8bcbcb949d5a5fd007 100644 (file)
--- a/i18n/english/luasrc/i18n/cbi.en.lua
+++ b/i18n/english/luasrc/i18n/cbi.en.lua
@@ -4,3 +4,4 @@ cbi_invalid = "Error: Invalid input value"
 cbi_addopt = "-- Additional Field --"
 cbi_optional = " (optional)"
 cbi_sectempty = "This section contains no values yet"
+cbi_saveapply = "Save & Apply"

diff --git a/i18n/german/luasrc/i18n/cbi.de.lua b/i18n/german/luasrc/i18n/cbi.de.lua
index f3ed319001f431eedc57d9f2dca9a8f0a2f6b266..f0eb7b6ae059008a631a956a7fa8484613df94df 100644 (file)
--- a/i18n/german/luasrc/i18n/cbi.de.lua
+++ b/i18n/german/luasrc/i18n/cbi.de.lua
@@ -3,3 +3,4 @@ cbi_del = "Eintrag entfernen"
 cbi_invalid = "Error: Ungültige Eingabe"
 cbi_addopt = "-- Zusätzliches Feld --"
 cbi_sectempty = "Diese Sektion enthält noch keine Einträge"
+cbi_saveapply = "Speichern & Anwenden"
\ No newline at end of file

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 6aec2fbbbc9caae17cfd2750fb433d55ec797f2d..e6952899f6c9f2022d562ef72aa74571718211a7 100644 (file)
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -154,6 +154,9 @@ end
 function Map.parse(self, ...)
        Node.parse(self, ...)
        uci.save(self.config)
+       if luci.http.formvalue("cbi.apply") then
+               uci.commit(self.config)
+       end
        uci.unload(self.config)
 end
 

diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm
index 4d21fd16841be229befc98d4e454b5383f203386..9ff8de7fd12a6cf7328e6b12ae0be290cf864d69 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/footer.htm
+++ b/libs/cbi/luasrc/view/cbi/footer.htm
@@ -14,6 +14,7 @@ $Id$
 -%>
 
        <div>
+               <input type="submit" name="cbi.apply" value="<%:cbi_saveapply%>" />
                <input type="submit" value="<%:save%>" />
                <input type="reset" value="<%:reset%>" />
                <script type="text/javascript">cbi_d_init();</script>