From d0221fabd4656b3a04251ca6168cc45f54d23574 Mon Sep 17 00:00:00 2001 From: jeff Date: Mon, 8 Feb 2010 15:37:29 +0000 Subject: grandstream device configuration support #4220 --- httemplate/edit/part_device.html | 30 ++++++++++++++++ httemplate/edit/process/part_device.html | 4 +++ httemplate/elements/checkboxes-table.html | 2 +- httemplate/misc/phone_device_config.html | 57 +++++++++++++++++++++++++++++++ httemplate/view/svc_phone.cgi | 3 ++ 5 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 httemplate/misc/phone_device_config.html (limited to 'httemplate') diff --git a/httemplate/edit/part_device.html b/httemplate/edit/part_device.html index 4f2fe93b4..aa626b379 100644 --- a/httemplate/edit/part_device.html +++ b/httemplate/edit/part_device.html @@ -6,6 +6,7 @@ 'devicename' => 'Device name', }, 'viewall_dir' => 'browse', + 'html_bottom' => $html_bottom_sub, ) %> <%init> @@ -13,4 +14,33 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); +my $extra_sql = + join( ' OR ', map { "exporttype = '$_'" } + keys %{FS::part_export::export_info('part_device')} + ); +$extra_sql = $extra_sql ? " WHERE ( $extra_sql ) " : " WHERE 0 = 1 "; + +my $html_bottom_sub = sub { + my $part_device = shift; + + '
'. + 'Exports
'. + + ''. + '
'. + include( '/elements/checkboxes-table.html', + 'source_obj' => $part_device, + 'link_table' => 'export_device', + 'target_table' => 'part_export', + 'extra_sql' => $extra_sql, + 'name_callback' => sub { my $o = shift; + $o->exporttype. ' to '. $o->machine; + }, + ). + '
'. + '
'; + +}; + + diff --git a/httemplate/edit/process/part_device.html b/httemplate/edit/process/part_device.html index 2b7e1da49..399991fc8 100644 --- a/httemplate/edit/process/part_device.html +++ b/httemplate/edit/process/part_device.html @@ -1,6 +1,10 @@ <% include( 'elements/process.html', 'table' => 'part_device', 'viewall_dir' => 'browse', + 'process_m2m' => { + 'link_table' => 'export_device', + 'target_table' => 'part_export', + }, ) %> <%init> diff --git a/httemplate/elements/checkboxes-table.html b/httemplate/elements/checkboxes-table.html index b6b04d111..a31bdb919 100644 --- a/httemplate/elements/checkboxes-table.html +++ b/httemplate/elements/checkboxes-table.html @@ -46,7 +46,7 @@ % % my $hashref = $opt{'hashref'} || {}; % -% my $extra_sql = ''; +% my $extra_sql = $opt{'extra_sql'} || ''; % % if ( $opt{'agent_virt'} ) { % $extra_sql .= ' AND' . $FS::CurrentUser::CurrentUser->agentnums_sql( diff --git a/httemplate/misc/phone_device_config.html b/httemplate/misc/phone_device_config.html new file mode 100644 index 000000000..9ea0d0d1c --- /dev/null +++ b/httemplate/misc/phone_device_config.html @@ -0,0 +1,57 @@ +%if ($config) { +<% $config %> +%}else{ +<% include("/elements/errorpage.html", "No configuration data produced.") %> +%} +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('View customer services'); + +my $exportnum; +if ( $cgi->param('exportnum') ) { + $cgi->param('exportnum') =~ /^(\d+)$/ or die "unparsable exportnum"; + $exportnum = $1; +} + +die "no export provided" + unless $exportnum; + +my $svcnum; +if ( $cgi->param('svcnum') ) { + $cgi->param('svcnum') =~ /^(\d+)$/ or die "unparsable svcnum"; + $svcnum = $1; +} + +my $devicenum; +if ( $cgi->param('devicenum') ) { + $cgi->param('devicenum') =~ /^(\d+)$/ or die "unparsable devicenum"; + $devicenum = $1; +} + +die "no device or service provided" + unless $svcnum || $devicenum; + +my $part_export = qsearchs('part_export', { 'exportnum' => $exportnum }) + or die "Unknown exportnum $exportnum\n"; + +my $phone_device; +my $svc_phone; +if ($devicenum) { + $phone_device = qsearchs('phone_device', { 'devicenum' => $devicenum }) + or die "Unknown device $devicenum\n"; + $svc_phone = $phone_device->svc_phone; +} else { + $svc_phone = qsearchs('svc_phone', { 'svcnum' => $svcnum }) + or die "Unknown svc_phone $svcnum\n"; +} + +my $config = $part_export->export_device_config($svc_phone, $phone_device); + +if ($config) { + http_header('Content-Type' => 'application/octet-stream'); + http_header('Content-Disposition' => 'attachment;filename="config"'); + http_header('Content-Length' => length($config)); +} + + diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi index 59ee2d516..2733e258e 100644 --- a/httemplate/view/svc_phone.cgi +++ b/httemplate/view/svc_phone.cgi @@ -58,6 +58,7 @@ my $html_foot = sub { 'Type'. 'MAC Addr'. ''. + ''. ''; my $bgcolor1 = '#eeeeee'; my $bgcolor2 = '#ffffff'; @@ -73,10 +74,12 @@ my $html_foot = sub { my $td = qq(); my $devicenum = $phone_device->devicenum; + my $export_links = join( '
', @{ $phone_device->export_links } ); $devices .= ''. $td. $phone_device->part_device->devicename. ''. $td. $phone_device->mac_addr. ''. + $td. $export_links. ''. "$td( ". qq(edit | ). qq(delete). -- cgit v1.2.1