applications/luci-asterisk: "Registered Trunks" -> "Trunks" in sip trunk overview

[project/luci.git] / applications / luci-asterisk / luasrc / model / cbi / asterisk / trunks.lua

diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
index b9dd1dfd8d1892db40d4248f6fe57ef0df06bf94..85527c297c3beeef557693f8c058a13173ce3aa7 100644 (file)
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
@@ -15,7 +15,8 @@ $Id$
 
 local ast = require("luci.asterisk")
 
-cbimap = Map("asterisk", "asterisk", "")
+cbimap = Map("asterisk", "Trunks")
+cbimap.pageaction = false
 
 local sip_peers = { }
 cbimap.uci:foreach("asterisk", "sip",
@@ -28,46 +29,78 @@ cbimap.uci:foreach("asterisk", "sip",
        end)
 
 
-sip_table = cbimap:section(Table, sip_peers, "SIP Trunks")
-sip_table.template = "cbi/tblsection"
-sip_table.extedit  = luci.dispatcher.build_url("admin", "asterisk", "trunks", "sip", "%s")
+sip_table = cbimap:section(TypedSection, "sip", "SIP Trunks")
+sip_table.template    = "cbi/tblsection"
+sip_table.extedit     = luci.dispatcher.build_url("admin", "asterisk", "trunks", "sip", "%s")
+sip_table.addremove   = true
+sip_table.sectionhead = "Extension"
 
-name = sip_table:option(DummyValue, "name")
-user = sip_table:option(DummyValue, "username")
+function sip_table.filter(self, s)
+       return s and (
+               cbimap.uci:get("asterisk", s, "type") == nil or
+               cbimap.uci:get_bool("asterisk", s, "provider")
+       )
+end
 
-host = sip_table:option(DummyValue, "host")
-function host.cfgvalue(self, s)
-       if sip_peers[s].info.address then
-               return "%s:%i" %{ sip_peers[s].info.address, sip_peers[s].info.port }
+function sip_table.create(self, section)
+       if TypedSection.create(self, section) then
+               created = section
        else
-               return "n/a"
+               self.invalid_cts = true
        end
 end
 
-context = sip_table:option(DummyValue, "context")
-context.href = luci.dispatcher.build_url("admin", "asterisk", "dialplan")
+function sip_table.parse(self, ...)
+       TypedSection.parse(self, ...)
+       if created then
+               cbimap.uci:tset("asterisk", created, {
+                       type     = "friend",
+                       qualify  = "yes",
+                       provider = "yes"
+               })
+
+               cbimap.uci:save("asterisk")
+               luci.http.redirect(luci.dispatcher.build_url(
+                       "admin", "asterisk", "trunks", "sip", created
+               ))
+       end
+end
 
-nat = sip_table:option(DummyValue, "nat")
-function nat.cfgvalue(self, s)
-       return sip_peers[s].info.Nat or "none"
+
+user = sip_table:option(DummyValue, "username", "Username")
+
+context = sip_table:option(DummyValue, "context", "Dialplan")
+context.href = luci.dispatcher.build_url("admin", "asterisk", "dialplan")
+function context.cfgvalue(...)
+       return AbstractValue.cfgvalue(...) or "(default)"
 end
 
-online = sip_table:option(DummyValue, "online")
+online = sip_table:option(DummyValue, "online", "Registered")
 function online.cfgvalue(self, s)
-       if sip_peers[s].info.online == nil then
+       if sip_peers[s] and sip_peers[s].info.online == nil then
                return "n/a"
        else
-               return sip_peers[s].info.online and "yes" or "no"
+               return sip_peers[s] and sip_peers[s].info.online
+                       and "yes" or "no (%s)" %{
+                               sip_peers[s] and sip_peers[s].info.Status:lower() or "unknown"
+                       }
        end
 end
 
-delay = sip_table:option(DummyValue, "delay")
+delay = sip_table:option(DummyValue, "delay", "Delay")
 function delay.cfgvalue(self, s)
-       if sip_peers[s].info.online then
+       if sip_peers[s] and sip_peers[s].info.online then
                return "%i ms" % sip_peers[s].info.delay
        else
                return "n/a"
        end
 end
 
+info = sip_table:option(Button, "_info", "Info")
+function info.write(self, s)
+       luci.http.redirect(luci.dispatcher.build_url(
+               "admin", "asterisk", "trunks", "sip", s, "info"
+       ))
+end
+
 return cbimap