diff options
| -rw-r--r-- | provisioning-model.lua | 17 | ||||
| -rw-r--r-- | provisioning-scripts.lua | 80 | ||||
| -rwxr-xr-x | upgradeprovisioning | 4 | 
3 files changed, 54 insertions, 47 deletions
| diff --git a/provisioning-model.lua b/provisioning-model.lua index 5c8312e..8f57e9a 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -1104,6 +1104,7 @@ mymodule.get_group = function(self, clientdata)  	retval.seq = cfe({label="Sequence", seq=4})  	retval.params = cfe({type="multi", value={}, label="Parameters", option={}, descr="Each selected parameter will be included in the group", seq=5})  	retval.editable = cfe({type="multi", value={}, label="Editable Parameters", option={}, descr="Each selected parameter will be user editable", seq=6}) +	retval.override = cfe({type="multi", value={}, label="Overridden Parameters", option={}, descr="Each selected parameter will override the parameter default from the group defaults", seq=7})  	retval.defaults = cfe({type="group", value={}, label="Parameter Defaults", seq=8})  	local errtxt  	local res, err = pcall(function() @@ -1114,6 +1115,7 @@ mymodule.get_group = function(self, clientdata)  		for i,p in ipairs(tmp) do  			retval.params.option[#retval.params.option + 1] = {value=p.param_id, label=p.label}  			retval.editable.option[#retval.editable.option + 1] = {value=p.param_id, label=p.label} +			retval.override.option[#retval.override.option + 1] = {value=p.param_id, label=p.label}  			p.seq = i  			if p.type == "select" then  				sql = "SELECT * FROM provisioning_options WHERE param_id='"..provdb.escape(p.param_id).."' ORDER BY seq ASC" @@ -1144,6 +1146,7 @@ mymodule.get_group = function(self, clientdata)  					retval.editable.value[#retval.editable.value + 1] = p.param_id  				end  				if p.value then +					retval.override.value[#retval.override.value + 1] = p.param_id  					if retval.defaults.value[p.param_id].type == "boolean" then  						retval.defaults.value[p.param_id].value = (p.value == "true")  					else @@ -1175,6 +1178,7 @@ mymodule.update_group = function(self, group, action, create)  	-- Validate the settings  	success = modelfunctions.validatemulti(group.value.params) and success  	success = modelfunctions.validatemulti(group.value.editable) and success +	success = modelfunctions.validatemulti(group.value.override) and success  	if group.value.name.value == "" then  		success = false  		group.value.name.errtxt = "Cannot be blank" @@ -1242,15 +1246,14 @@ mymodule.update_group = function(self, group, action, create)  				for i,p in ipairs(group.value.editable.value) do  					reverseeditable[p] = i  				end +				-- Reverse the override table for ease of use below +				local reverseoverride = {} +				for i,p in ipairs(group.value.override.value) do +					reverseoverride[p] = "'"..provdb.escape(tostring(group.value.defaults.value[p].value)).."'" +				end  				-- Insert the group to param entries  				for i,p in ipairs(group.value.params.value) do -					sql = "INSERT INTO param_groups_to_params VALUES('"..provdb.escape(group.value.group_id.value).."', '"..provdb.escape(p).."', " -					if group.value.defaults.value[p].value ~= group.value.defaults.value[p].default then -						sql = sql.."'"..provdb.escape(tostring(group.value.defaults.value[p].value)).."'" -					else -						sql = sql.."null" -					end -					sql = sql..", '"..provdb.escape(tostring(reverseeditable[p] ~= nil)).."')" +					sql = "INSERT INTO param_groups_to_params VALUES('"..provdb.escape(group.value.group_id.value).."', '"..provdb.escape(p).."', "..(reverseoverride[p] or "null")..", '"..provdb.escape(tostring(reverseeditable[p] ~= nil)).."')"  					runsqlcommand(sql)  				end diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua index 434f49c..cb25ab2 100644 --- a/provisioning-scripts.lua +++ b/provisioning-scripts.lua @@ -453,7 +453,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='pcportenable'), null, false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='urldialingenable'), null, false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='militarytimeenable'), null, false)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='displaylang'), '', false)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='displaylang'), null, false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Snom Device'), (SELECT param_id FROM provisioning_params WHERE name='template'), '/etc/provisioning/templates/snom-template.lua', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Snom Device'), (SELECT param_id FROM provisioning_params WHERE name='mac'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Snom Device'), (SELECT param_id FROM provisioning_params WHERE name='registrar'), null, false)", @@ -503,7 +503,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Linksys)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Linksys)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -547,7 +547,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Linksys)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Linksys)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -586,7 +586,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -607,7 +607,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 4 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 4 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 4 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 4 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 4 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 4 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 4 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 4 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -628,7 +628,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 5 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 5 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 5 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 5 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 5 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 5 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 5 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 5 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -646,7 +646,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 6 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 6 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 6 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 6 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 6 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 6 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 6 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 6 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -664,7 +664,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 7 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 7 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 7 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 7 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 7 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 7 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 7 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 7 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -679,7 +679,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 8 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 8 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 8 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 8 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 8 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 8 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 8 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 8 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -694,7 +694,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 9 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 9 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 9 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 9 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 9 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 9 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 9 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 9 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -709,7 +709,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 10 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 10 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 10 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 10 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 10 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 10 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 10 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 10 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -724,7 +724,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 11 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 11 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 11 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 11 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 11 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 11 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 11 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 11 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -739,7 +739,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 12 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 12 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 12 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 12 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 12 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 12 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 12 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 12 (Snom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -754,7 +754,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 13 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 13 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 13 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 13 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 13 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 13 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 14 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 14 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -766,7 +766,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 14 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 14 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 14 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 14 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 14 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 14 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 15 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 15 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -778,7 +778,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 15 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 15 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 15 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 15 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 15 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 15 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 16 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 16 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -790,7 +790,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 16 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 16 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 16 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 16 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 16 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 16 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 17 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 17 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -802,7 +802,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 17 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 17 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 17 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 17 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 17 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 17 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 18 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 18 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -814,7 +814,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 18 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 18 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 18 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 18 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 18 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 18 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 19 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 19 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -826,7 +826,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 19 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 19 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 19 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 19 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 19 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 19 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 20 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 20 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -838,7 +838,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 20 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 20 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 20 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 20 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 20 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 20 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 21 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 21 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -850,7 +850,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 21 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 21 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 21 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 21 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 21 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 21 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 22 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 22 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -862,7 +862,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 22 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 22 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 22 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 22 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 22 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 22 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 23 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 23 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -874,7 +874,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 23 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 23 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 23 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 23 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 23 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 23 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 24 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 24 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -886,7 +886,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 24 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 24 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 24 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 24 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 24 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 24 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 25 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 25 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -898,7 +898,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 25 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 25 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 25 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 25 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 25 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 25 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 26 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 26 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -910,7 +910,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 26 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 26 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 26 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 26 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 26 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 26 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 27 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 27 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -922,7 +922,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 27 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 27 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 27 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 27 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 27 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 27 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 28 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 28 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -934,7 +934,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 28 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 28 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 28 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 28 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 28 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 28 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 29 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 29 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -946,7 +946,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 29 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 29 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 29 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 29 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 29 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 29 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 30 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 30 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -958,7 +958,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 30 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 30 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 30 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 30 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 30 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 30 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 31 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 31 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -970,7 +970,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 31 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 31 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 31 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 31 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 31 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 31 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 32 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 32 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -982,7 +982,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 32 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 32 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 32 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 32 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 32 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 32 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 33 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 33 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -994,7 +994,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 33 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 33 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 33 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 33 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 33 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 33 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 34 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='extension'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 34 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='password'), null, false)", @@ -1006,7 +1006,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 34 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='forwardallenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 34 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callerid'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 34 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='polycomringtone'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 34 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 34 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), null, true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Registration 34 (Polycom)'), (SELECT param_id FROM provisioning_params WHERE name='scaenable'), null, true)",  	-- Services  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='forwarding'), 'true', false)", @@ -1014,8 +1014,8 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='callhistoryenable'), 'true', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'true', false)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailcallback'), null, true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), '', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailcallback'), '', true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='provpollingtime'), '02:00', true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='dndenable'), 'true', true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='softkey1'), 'false', false)", @@ -1033,8 +1033,8 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='callhistoryenable'), 'true', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'true', false)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), null, true)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailcallback'), null, true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), '', true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailcallback'), '', true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='provpollingtime'), '10:00', true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='dndenable'), 'true', true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='softkey1'), 'false', false)", @@ -1066,7 +1066,7 @@ mymodule.param_groups_to_params = {  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Public Phone'), (SELECT param_id FROM provisioning_params WHERE name='softkey10'), 'false', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='forwarding'), 'false', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='hotlineenable'), 'true', false)", -	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='hotlinedestination'), null, true)", +	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='hotlinedestination'), '', true)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='callhistoryenable'), 'false', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', false)",  	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'false', false)", diff --git a/upgradeprovisioning b/upgradeprovisioning index da1dd66..ffaa99a 100755 --- a/upgradeprovisioning +++ b/upgradeprovisioning @@ -548,6 +548,10 @@ if [ "$version" -lt "7" ]; then  	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Internal', '2', '2')" provisioning  	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Disabled', '3', '3')" provisioning +	# device and reg param groups should not override defaults with same value, other group types should +	psql -U postgres -c "UPDATE param_groups_to_params SET value=null WHERE (group_id, param_id) IN (SELECT group_id, param_id FROM (provisioning_groups g JOIN param_groups_to_params g2p USING(group_id) JOIN provisioning_params p USING(param_id)) WHERE (g.name LIKE 'reg%' OR g.name LIKE 'device%') AND g2p.value=p.value)" provisioning +	psql -U postgres -c "UPDATE param_groups_to_params o SET value=(SELECT value FROM provisioning_params WHERE param_id=o.param_id) WHERE (group_id, param_id) IN (SELECT group_id, param_id FROM (provisioning_groups g JOIN param_groups_to_params g2p USING(group_id) JOIN provisioning_params p USING(param_id)) WHERE g.name NOT LIKE 'reg%' AND g.name NOT LIKE 'device%' AND g2p.value IS NULL)" provisioning +  	# database  	psql -U postgres -c "UPDATE provisioning_params SET value='7' WHERE name='databaseversion'" provisioning  fi | 
