[freeside-commits] branch master updated. 53a39f74f4735253591e6df083522b3a3bbacd6d

[Mark Wells]

The branch, master has been updated
       via  53a39f74f4735253591e6df083522b3a3bbacd6d (commit)
       via  e11f3188435b30c193fd1443913ed77953e14dea (commit)
      from  dba9a62fa32e07d4461e9c081201f69c0cda7015 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 53a39f74f4735253591e6df083522b3a3bbacd6d
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Feb 18 15:50:51 2015 -0800

    in FCC options editor, jump back to correct page after submitting, #32638

diff --git a/httemplate/browse/part_pkg-fcc.html b/httemplate/browse/part_pkg-fcc.html
index bdfb99a..69e7d8f 100755
--- a/httemplate/browse/part_pkg-fcc.html
+++ b/httemplate/browse/part_pkg-fcc.html
@@ -197,6 +197,13 @@ my $html_form = qq!<FORM ACTION="${p}edit/process/bulk-part_pkg-fcc.html" METHOD
   ' )
   <BR><BR>';
 
+# pass the page selection through so we can jump back to the current spot
+if ( $cgi->param('maxrecords') =~ /^(\d+)$/ ) {
+  $html_form .= qq!<INPUT TYPE="hidden" NAME="maxrecords" VALUE="$1">!;
+}
+if ( $cgi->param('offset') =~ /^(\d+)$/ ) {
+  $html_form .= qq!<INPUT TYPE="hidden" NAME="offset" VALUE="$1">!;
+}
 
 # restore this only after creating $html_form
 $cgi->param('classnum', $classnum) if length($classnum);
@@ -228,7 +235,7 @@ my @menubar =
   }
 
   function filter_change() {
-    window.location = '! . $cgi->self_url . qq!?classnum='
+    window.location = '<% $cgi->self_url %>?classnum='
       + document.getElementById('classnum').value;
   }
 </script>
diff --git a/httemplate/edit/process/bulk-part_pkg-fcc.html b/httemplate/edit/process/bulk-part_pkg-fcc.html
index 8ef3308..d060a24 100644
--- a/httemplate/edit/process/bulk-part_pkg-fcc.html
+++ b/httemplate/edit/process/bulk-part_pkg-fcc.html
@@ -17,7 +17,7 @@
 %   }
 <% $cgi->redirect($fsurl.'browse/part_pkg-fcc.html?redirect='.$session) %>
 % } else {
-<% $cgi->redirect($fsurl.'browse/part_pkg-fcc.html?classnum='.$classnum.$jump) %>
+<% $cgi->redirect($dest) %>
 % }
 <%init>
 my $curuser = $FS::CurrentUser::CurrentUser;
@@ -38,10 +38,14 @@ foreach my $param ($cgi->param) {
   $error{$pkgpart} = $error if $error;
 }
 
-my $classnum = $cgi->param('classnum');
+my $dest = $fsurl.'browse/part_pkg-fcc.html?';
+foreach (qw(classnum maxrecords offset)) {
+  if ( $cgi->param($_) =~ /^(\d+)$/ ) {
+    $dest .= "$_=$1;";
+  }
+}
 
-my $jump = '';
 if ( $cgi->param('jump') =~ /^pkgpart(\d+)$/ ) {
-  $jump = '#'.$1;
+  $dest .= "#$1";
 }
 </%init>

commit e11f3188435b30c193fd1443913ed77953e14dea
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Feb 18 15:50:45 2015 -0800

    use media type codes in broadband subscription report, #28020

diff --git a/FS/FS/Report/FCC_477.pm b/FS/FS/Report/FCC_477.pm
index c93c919..75ddee0 100644
--- a/FS/FS/Report/FCC_477.pm
+++ b/FS/FS/Report/FCC_477.pm
@@ -400,7 +400,8 @@ sub fbs_sql {
 
   my @select = (
     "$censustract AS censustract",
-    'technology',
+    '(technology - technology % 10) AS media_type',
+      # media types are multiples of 10
     'broadband_downstream',
     'broadband_upstream',
     "SUM($q)",

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Report/FCC_477.pm                        |    3 ++-
 httemplate/browse/part_pkg-fcc.html            |    9 ++++++++-
 httemplate/edit/process/bulk-part_pkg-fcc.html |   12 ++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)