[asterisk-gui] Updated Diff...
Andrew Latham
lathama at gmail.com
Thu Dec 16 13:58:02 UTC 2010
All
Just incase anyone is working on any of these, here is an internal
diff we are using. The Makefile is an old code removal and
documentation update... These changes along with others are being
used with several large 1.8 installations. On list emails only
please. Please take the time to comment and test the open issues on
the Asterisk Issue Tracker.
Beware of: https://issues.asterisk.org/view.php?id=18268#129498
Also refer to:
https://issues.asterisk.org/view.php?id=18266
https://issues.asterisk.org/view.php?id=18181
https://issues.asterisk.org/view.php?id=17977
Index: config/js/incoming.js
===================================================================
--- config/js/incoming.js (revision 5138)
+++ config/js/incoming.js (working copy)
@@ -356,7 +356,7 @@
var this_tiName = ASTGUI.getFieldValue('edit_itrl_tf') ;
var TMP_NEW_PATTERN = ASTGUI.getFieldValue('edit_itrl_pattern');
var dest = $('#edit_itrl_dest').val();
- var local_dest = $('#edit_itrl_LocalDest_Pattern
option:selected').text();
+ var local_dest =
ASTGUI.getFieldValue('edit_itrl_LocalDest_Pattern');
var time_int_name = $('#edit_itrl_tf option:selected').text();
time_int_name = (time_int_name.contains('no Time
Intervals')) ? '' : time_int_name;
Index: config/js/index.js
===================================================================
--- config/js/index.js (revision 5138)
+++ config/js/index.js (working copy)
@@ -551,7 +528,7 @@
}
//if( sessionData.PLATFORM.isAA50 ){
- DOM_mainscreen.src = 'home.html?status=1';
+ DOM_mainscreen.src = 'home.html?status=0';
//}
if( sessionData.PLATFORM.isAA50 &&
sessionData.PLATFORM.AA50_SKU.contains('800') ){
@@ -1117,7 +1094,7 @@
* doing time intervals for includes :-/
* */
if (!sessionData.PLATFORM.isAST_1_6) {
- top.session.delimiter = '|';
+ top.session.delimiter = ',';
}
};
Index: config/js/pbx2.js
===================================================================
--- config/js/pbx2.js (revision 5138)
+++ config/js/pbx2.js (working copy)
@@ -206,7 +206,7 @@
var exten = ASTGUI.parseContextLine.getExten(line);
var options = line.afterChar('=');
- var params = options.betweenXY('|',')');
+ var params =
options.afterChar(',').afterChar(',').betweenXY(',',')');
if (params.contains('a') && params.contains('A')) {
exten = ASTGUI.parseContextLine.getArgs(line)[0];
@@ -243,7 +243,7 @@
var name = line.betweenXY('=',',');
name = name.trim();
- if(!sessionData.pbxinfo.hasOwnProperty(name)) {
+ if(!sessionData.pbxinfo.conferences.hasOwnProperty(name)) {
sessionData.pbxinfo.conferences[name] = new
ASTGUI.customObject;
sessionData.pbxinfo.conferences[name]['configOptions'] = '';
}
@@ -744,7 +744,7 @@
};
var sip_changes = {
'general' : {
- 'subscribecontext' : ASTGUI.contexts.subscribe
+ // 'subscribecontext' : ASTGUI.contexts.subscribe
}
};
@@ -774,7 +774,7 @@
}
var sip_conf = listOfSynActions('sip.conf');
- var sipconfig = config2json({filename: 'sip.conf', usf:0});
+ var sipconfig = config2json({filename: 'sip.conf', usf:1});
if (!sipconfig['general'].hasOwnProperty('subscribecontext')) {
sip_conf.new_action('append', 'general',
'subscribecontext', sip_changes['general']['subscribecontext']);
}
Index: config/js/astman.js
===================================================================
--- config/js/astman.js (revision 5138)
+++ config/js/astman.js (working copy)
@@ -359,8 +359,8 @@
contexts: {
guitools : 'asterisk_guitools', // gui tools context
dialtrunks : 'trunkdial-failover-0.3', // trunkdial
macro with failback trunk and setcid, ASTGUI.contexts.dialtrunks
+ subscribe : 'default', //subscribecontext for
sip.conf (aka devicestate fun)
localcrcid: 'local-callingrule-cid-0.1', // setcid for
local calling rules, ASTGUI.contexts.localcrcid
- subscribe : 'device-hints', //subscribecontext for
sip.conf (aka devicestate fun)
CONFERENCES : 'conferences', // ASTGUI.contexts.CONFERENCES
QUEUES : 'queues', //ASTGUI.contexts.QUEUES
TrunkDIDPrefix : 'DID_', // context for trunks - -
ASTGUI.contexts.TrunkDIDPrefix
@@ -477,7 +477,7 @@
field = _$(field);
}
var required = $(field).attr('required');
- if( required && required.isAstTrue() ){
+ if( required ){
var x = field.value.trim() ;
var pcn = ( field.className ) ?
field.className : '' ;
if( !x ){
Index: config/js/users.js
===================================================================
--- config/js/users.js (revision 5138)
+++ config/js/users.js (working copy)
@@ -361,7 +361,7 @@
ASTGUI.feedback( { msg: ' Please select one or more
users to delete !', showfor: 4 });
return;
}
- if( !confirm('Are you sure you want to delete the selected
users - ' + sel_users.join(',') + ' ? \n\n Note: This would delete any
voicemails stored in the users mailboxes.') ) { return; }
+ if( !confirm('Are you sure you want to delete the selected
users? \n\n Note: This would delete any voicemails stored in the users
mailboxes.') ) { return; }
var after_deletingFirstUser = function(){
sel_users.removeFirst();
Index: config/sip.html
===================================================================
--- config/sip.html (revision 5138)
+++ config/sip.html (working copy)
@@ -502,7 +502,7 @@
</td>
</tr>
<tr> <td align=right>Reject NonMatching Invites:</td>
- <td><input type='checkbox' id='alwaysauthreject'>
+ <td><input type='checkbox' checked
id='alwaysauthreject'>
<img src="images/tooltip_info.gif"
tip="en,sip_general,38" class='tooltipinfo'>
</td>
</tr>
Index: config/index.html
===================================================================
--- config/index.html (revision 5138)
+++ config/index.html (working copy)
@@ -44,18 +42,22 @@
<div class="accordionAndActive_div">
<div id="accordion_div" style='display:none; width: 170px;'>
<div page='home.html?status=1'>
- <div class="ui-accordion-link">Home</div>
- <div
class="ui-accordion-desc">Asterisk Configuration Panel - Please click
on a panel to manage related features</div>
+ <div class="ui-accordion-link">Status</div>
+ <div class="ui-accordion-desc">Use the
Home link for less info.</div>
</div>
- <div page='digital.html'>
+ <div page='home.html?status=0'>
+ <div class="ui-accordion-link">Home</div>
+ <div
class="ui-accordion-desc">Asterisk Configuration Panel - Please click
on a panel to manage related features</div>
+ </div>
Index: Makefile
===================================================================
--- Makefile (revision 5138)
+++ Makefile (working copy)
@@ -115,16 +115,6 @@
$(SUBDIRS):
@$(MAKE) -C $@
-config:
- @cp init.d/rc.asterisk-gui $(DESTDIR)/etc/rc.d/init.d/asterisk-gui
- @chmod 755 $(DESTDIR)/etc/rc.d/init.d/asterisk-gui
- @if [ -z "$(DESTDIR)" ]; then chkconfig --add asterisk-gui; fi
- @echo " +-------- Asterisk-GUI Config Complete -------+"
- @echo " + The Asterisk-GUI has been added to your +"
- @echo " + services: +"
- @echo " + service <asterisk-gui> {start|stop|restart} +"
- @echo " +---------------------------------------------+"
-
checkconfig:
@echo " --- Checking Asterisk configuration to see if it will
support the GUI ---"
@echo -n "* Checking for http.conf: "
@@ -195,8 +185,8 @@
@echo ""
@echo " [admin]"
@echo " secret = mysecret$$$$"
- @echo " read = system,call,log,verbose,command,agent,config"
- @echo " write = system,call,log,verbose,command,agent,config"
+ @echo " read =
system,call,log,verbose,command,agent,config,read,write,originate"
+ @echo " write =
system,call,log,verbose,command,agent,config,read,write,originate"
@echo ""
@echo " --- Good luck! --- "
~~~ Andrew "lathama" Latham lathama at gmail.com ~~~
More information about the asterisk-gui
mailing list