sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#8299 Show disp name and ext in pbx dev config

Browse Source
gjungwirth/email_test
Andreas Granig 11 years ago
parent c44d28ef54
commit c5067b4cac
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File

4
lib/NGCP/Panel/Controller/Customer.pm
Unescape View File

@ -1074,7 +1074,6 @@ sub pbx_device_create :Chained('base') :PathPart('pbx/device/create') :Args(0) {
my $station_name = $form->params->{station_name};
my $identifier = lc $form->params->{identifier};
if($identifier =~ /^([a-f0-9]{2}:){5}[a-f0-9]{2}$/) {
# TODO: should we really automatically strip : from identifiers?
$identifier =~ s/\://g;
}
my $profile_id = $form->params->{profile_id};
@ -1203,6 +1202,9 @@ sub pbx_device_edit :Chained('pbx_device_base') :PathPart('edit') :Args(0) {
my $fdev = $c->stash->{pbx_device};
my $station_name = $form->params->{station_name};
my $identifier = lc $form->params->{identifier};
if($identifier =~ /^([a-f0-9]{2}:){5}[a-f0-9]{2}$/) {
$identifier =~ s/\://g;
}
my $profile_id = $form->params->{profile_id};
$fdev->update({
profile_id => $profile_id,

1
lib/NGCP/Panel/Form/Customer/PbxFieldDevice.pm
Unescape View File

@ -27,7 +27,6 @@ sub build_profiles {
return unless $c;
my $profile_rs = $c->stash->{autoprov_profile_rs};
my @options = ();
push @options, { label => '', value => undef };
foreach my $p($profile_rs->all) {
push @options, { label => $p->name, value => $p->id };
}

6
share/templates/customer/details.tt
Unescape View File

@ -656,7 +656,7 @@
'<option value="0">[% c.loc("Subscriber") %]</option>' +
[% subs = [] -%]
[% FOR sub IN subs.merge(pbx_groups.all, subscribers.all) -%]
'<option value="[% sub.provisioning_voip_subscriber.id %]">[% sub.username _ "@" _ sub.domain.domain %]</option>' +
'<option value="[% sub.provisioning_voip_subscriber.id %]">[% sub.provisioning_voip_subscriber.display_name ? sub.provisioning_voip_subscriber.display_name : sub.username %][% sub.provisioning_voip_subscriber.pbx_extension.defined ? " (" _ sub.provisioning_voip_subscriber.pbx_extension _ ")" : "" %]</option>' +
[% END -%]
'</select>' +
'<select class="modeselect" name="line.' + formcnt + '.type" id="line.' + formcnt + '.type">' +
@ -688,7 +688,7 @@
'<option value="0">[% c.loc("None") %]</option>' +
[% subs = [] -%]
[% FOR sub IN subs.merge(pbx_groups.all, subscribers.all) -%]
'<option value="[% sub.provisioning_voip_subscriber.id %]"' + (linekeys[idx].subid == [% sub.provisioning_voip_subscriber.id %] ? ' selected="selected"' : '') + '>[% sub.username _ "@" _ sub.domain.domain %]</option>' +
'<option value="[% sub.provisioning_voip_subscriber.id %]"' + (linekeys[idx].subid == [% sub.provisioning_voip_subscriber.id %] ? ' selected="selected"' : '') + '>[% sub.provisioning_voip_subscriber.display_name ? sub.provisioning_voip_subscriber.display_name : sub.username %][% sub.provisioning_voip_subscriber.pbx_extension.defined ? " (" _ sub.provisioning_voip_subscriber.pbx_extension _ ")" : "" %]</option>' +
[% END -%]
'</select>' +
'<select class="modeselect" name="line.' + formcnt + '.type" id="line.' + formcnt + '.type">' +
@ -705,7 +705,7 @@
'<option value="0">[% c.loc("Subscriber") %]</option>' +
[% subs = [] -%]
[% FOR sub IN subs.merge(pbx_groups.all, subscribers.all) -%]
'<option value="[% sub.provisioning_voip_subscriber.id %]">[% sub.username _ "@" _ sub.domain.domain %]</option>' +
'<option value="[% sub.provisioning_voip_subscriber.id %]">[% sub.provisioning_voip_subscriber.display_name ? sub.provisioning_voip_subscriber.display_name : sub.username %][% sub.provisioning_voip_subscriber.pbx_extension.defined ? " (" _ sub.provisioning_voip_subscriber.pbx_extension _ ")" : "" %]</option>' +
[% END -%]
'</select>' +
'<select class="modeselect" name="line.' + formcnt + '.type" id="line.' + formcnt + '.type">' +

Write Preview
Loading…
Cancel
Save