applications/luci-asterisk: adept meetme example in default config to current format...

diff --git a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
index 2c6895b929ecbf437715019656eab8f0c51cbb38..a46a8db179ec7f1eb9cead3e9b3326d27ec37175 100644 (file)
--- a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
+++ b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
@@ -159,7 +159,8 @@ $Id$
                                <% for ext, room in luci.util.kspairs(plan.meetmerooms) do rooms_used[room.room] = true %>
                                <tr class="cbi-section-table-row <%=rowstyle(row)%>">
                                        <td style="text-align: left; padding: 3px" class="cbi-section-table-cell">
-                                               <strong>&#x2514; MeetMe Room <em><%=room.room%></em></strong> (<%=room.description%>)
+                                               <strong>&#x2514; MeetMe Room <em><%=room.room%></em></strong>
+                                               <% if room.description and #room.description > 0 then %> (<%=room.description%>)<% end %>
                                                <p style="padding-left: 1em; margin-bottom:0">
                                                        Matches: <%=format_matches(ext)%>
                                                </p>
@@ -209,7 +210,10 @@ $Id$
                                                        <option value="">-- please select --</option>
                                                        <% for ext, room in luci.util.kspairs(ast.meetme.rooms()) do %>
                                                                <%# if not rooms_used[room.room] then %>
-                                                                       <option value="<%=room.room%>"><%=room.room%> (<%=room.description%>)</option>
+                                                                       <option value="<%=room.room%>">
+                                                                               <%=room.room%>
+                                                                               <% if room.description and #room.description > 0 then %>(<%=room.description%>)<% end %>
+                                                                       </option>
                                                                <%# end %>
                                                        <% end %>
                                                </select>

diff --git a/applications/luci-asterisk/root/etc/config/asterisk b/applications/luci-asterisk/root/etc/config/asterisk
index 9ab00efe07e0bf89e9f506c398ff8e575961cb66..248409793c0c702b55b7bc2672bc145d4094170c 100644 (file)
--- a/applications/luci-asterisk/root/etc/config/asterisk
+++ b/applications/luci-asterisk/root/etc/config/asterisk
@@ -220,7 +220,8 @@ config 'dialzone' 'international'
 config 'meetmegeneral'
        option 'audiobuffers' '32'
 
-config 'meetme' '101'
+config 'meetme'
+       option 'room' '101'
        option 'pin' ''
        option 'adminpin' ''