libs/web: add support for post commit redirects in cbi maps
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 31 Oct 2010 19:34:45 +0000 (19:34 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 31 Oct 2010 19:34:45 +0000 (19:34 +0000)
libs/web/luasrc/view/cbi/apply_xhr.htm
libs/web/luasrc/view/cbi/map.htm

index 30e7a23b585e188965dc9740f8c5c2c8c8aba166..11851ad8100314b2e5e5e877b1522ee27b1a67af 100644 (file)
@@ -12,7 +12,7 @@ $Id$
 
 -%>
 
-<% export("cbi_apply_xhr", function(id, configs) -%>
+<% export("cbi_apply_xhr", function(id, configs, redirect) -%>
 <fieldset class="cbi-section" id="cbi-apply-<%=id%>">
        <legend><%:Applying changes%></legend>
        <script type="text/javascript"><![CDATA[
@@ -33,7 +33,10 @@ $Id$
                                                                        if( e )
                                                                        {
                                                                                e.innerHTML = '<%:Configuration applied.%>';
-                                                                               window.setTimeout(function() { e.parentNode.style.display = 'none' }, 1000);
+                                                                               window.setTimeout(function() {
+                                                                                       e.parentNode.style.display = 'none';
+                                                                                       <% if redirect then %>location.href='<%=redirect%>';<% end %>
+                                                                               }, 1000);
                                                                        }
                                                                }
                                                                else
index 666763d69dd9e7cc51cfba62b3eae579bec46805..640c3d115770e9d45f69070ce3d6474a6f35336e 100644 (file)
@@ -18,7 +18,7 @@ $Id$
 <div class="cbi-map" id="cbi-<%=self.config%>">
        <% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
        <% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
-       <%- if self._apply then cbi_apply_xhr(self.config, self.parsechain) end -%>
+       <%- if self._apply then cbi_apply_xhr(self.config, self.parsechain, self.redirect) end -%>
        <%- self:render_children() %>
        <br />
 </div>