From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 31 Oct 2010 19:34:45 +0000 (+0000)
Subject: libs/web: add support for post commit redirects in cbi maps
X-Git-Tag: 0.10.0~541
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=b3b708a585759ca506e857ce5030d83ddd190b1e;ds=sidebyside

libs/web: add support for post commit redirects in cbi maps
---

diff --git a/libs/web/luasrc/view/cbi/apply_xhr.htm b/libs/web/luasrc/view/cbi/apply_xhr.htm
index 30e7a23b5..11851ad81 100644
--- a/libs/web/luasrc/view/cbi/apply_xhr.htm
+++ b/libs/web/luasrc/view/cbi/apply_xhr.htm
@@ -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
diff --git a/libs/web/luasrc/view/cbi/map.htm b/libs/web/luasrc/view/cbi/map.htm
index 666763d69..640c3d115 100644
--- a/libs/web/luasrc/view/cbi/map.htm
+++ b/libs/web/luasrc/view/cbi/map.htm
@@ -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>