treewide: improve handling of page redirections in uci change views

[project/luci.git] / modules / luci-mod-admin-full / luasrc / view / admin_uci / changes.htm

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
index 84e2287..6e725c8 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
@@ -1,12 +1,12 @@
 <%#
  Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
+ Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
  Licensed to the public under the Apache License 2.0.
 -%>
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Configuration%> / <%:Changes%></a></h2>
+<h2 name="content"><%:Configuration%> / <%:Changes%></h2>
 
 <% if changes then %>
        <%+admin_uci/changelog%>
@@ -16,24 +16,27 @@
 <% end %>
 
 <div class="cbi-page-actions">
-       <% local r = luci.http.formvalue("redir"); if r and #r > 0 then %>
+       <% local node, url = luci.dispatcher.lookup(luci.http.formvalue("redir")); if url then %>
        <div style="float:left">
-               <form class="inline" method="get" action="<%=luci.util.pcdata(r)%>">
+               <form class="inline" method="get" action="<%=luci.util.pcdata(url)%>">
                        <input class="cbi-button cbi-button-link" style="float:left; margin:0" type="submit" value="<%:Back%>" />
                </form>
        </div>
        <% end %>
 
        <div style="text-align:right">
-               <form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
+               <form class="inline" method="post" action="<%=controller%>/admin/uci/apply">
+                       <input type="hidden" name="token" value="<%=token%>" />
                        <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
                        <input class="cbi-button cbi-button-apply" type="submit" value="<%:Apply%>" />
                </form>
-               <form class="inline" method="get" action="<%=controller%>/admin/uci/saveapply">
+               <form class="inline" method="post" action="<%=controller%>/admin/uci/saveapply">
+                       <input type="hidden" name="token" value="<%=token%>" />
                        <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
                        <input class="cbi-button cbi-button-save" type="submit" value="<%:Save & Apply%>" />
                </form>
-               <form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
+               <form class="inline" method="post" action="<%=controller%>/admin/uci/revert">
+                       <input type="hidden" name="token" value="<%=token%>" />
                        <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
                        <input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" />
                </form>