applications/luci-asterisk: fix link to voicemail boxes, remove dialplanvoice and...

diff --git a/applications/luci-asterisk/luasrc/controller/asterisk.lua b/applications/luci-asterisk/luasrc/controller/asterisk.lua
index b321b5a..c258f2d 100644 (file)
--- a/applications/luci-asterisk/luasrc/controller/asterisk.lua
+++ b/applications/luci-asterisk/luasrc/controller/asterisk.lua
@@ -81,8 +81,6 @@ function handle_dialplan()
                        if #newinc > 0 then
                                uci:set("asterisk", plan.name, "include", newinc)
                        end
                        if #newinc > 0 then
                                uci:set("asterisk", plan.name, "include", newinc)
                        end

-
-                       uci:save("asterisk")

                end
        end
 
                end
        end
 


@@ -101,8 +99,6 @@ function handle_dialplan()
                        if #newinc > 0 then
                                uci:set("asterisk", plan.name, "include", newinc)
                        end
                        if #newinc > 0 then
                                uci:set("asterisk", plan.name, "include", newinc)
                        end

-
-                       uci:save("asterisk")

                end
        end
 
                end
        end
 


@@ -111,7 +107,6 @@ function handle_dialplan()
                if #v > 0 and plan then
                        uci:delete_all("asterisk", "dialplanvoice",
                                { extension=v, dialplan=plan.name })
                if #v > 0 and plan then
                        uci:delete_all("asterisk", "dialplanvoice",
                                { extension=v, dialplan=plan.name })

-                       uci:save("asterisk")

                end
        end
 
                end
        end
 


@@ -127,7 +122,6 @@ function handle_dialplan()
                                voicebox                = vbox.number,
                                voicecontext    = vbox.context
                        })
                                voicebox                = vbox.number,
                                voicecontext    = vbox.context
                        })

-                       uci:save("asterisk")

                end
        end
 
                end
        end
 


@@ -135,7 +129,6 @@ function handle_dialplan()
        if aname and #aname > 0 then
                if aname:match("^[a-zA-Z0-9_]+$") then
                        uci:section("asterisk", "dialplan", aname, { })
        if aname and #aname > 0 then
                if aname:match("^[a-zA-Z0-9_]+$") then
                        uci:section("asterisk", "dialplan", aname, { })

-                       uci:save("asterisk")

                else
                        err = true
                end
                else
                        err = true
                end


@@ -145,11 +138,14 @@ function handle_dialplan()
        if dname and #dname > 0 then
                if uci:get("asterisk", dname) == "dialplan" then
                        uci:delete("asterisk", dname)
        if dname and #dname > 0 then
                if uci:get("asterisk", dname) == "dialplan" then
                        uci:delete("asterisk", dname)

-                       uci:save("asterisk")
+                       uci:delete_all("asterisk", "dialplanvoice", { dialplan=dname })
+                       uci:delete_all("asterisk", "dialplanmeetme", { dialplan=dname })

                end
        end
 
                end
        end
 

+       uci:save("asterisk")

        ast.uci_resync()
        ast.uci_resync()

+

        luci.template.render("asterisk/dialplans", { create_error = err })
 end
 
        luci.template.render("asterisk/dialplans", { create_error = err })
 end
 

diff --git a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
index 47e6105..79b81bd 100644 (file)
--- a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
+++ b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
@@ -78,7 +78,7 @@ $Id$
                Here you can manage your dial plans which are used to route outgoing calls from your local extensions.<br /><br />
                Related tasks:<br />
                <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/zones')%>" class="cbi-title-ref">Manage dialzones</a> |
                Here you can manage your dial plans which are used to route outgoing calls from your local extensions.<br /><br />
                Related tasks:<br />
                <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/zones')%>" class="cbi-title-ref">Manage dialzones</a> |

-               <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/zones')%>" class="cbi-title-ref">Manage voicemailboxes</a>
+               <a href="<%=luci.dispatcher.build_url('admin/asterisk/voicemail/mailboxes')%>" class="cbi-title-ref">Manage voicemail boxes</a>

        </div>
        <!-- tblsection -->
        <fieldset class="cbi-section" id="cbi-asterisk-sip">
        </div>
        <!-- tblsection -->
        <fieldset class="cbi-section" id="cbi-asterisk-sip">