[freeside-commits] branch FREESIDE_4_BRANCH updated. 9de321e11b1463bda7d8dc9cfa2c438c66687a4b

[Christopher Burger]

The branch, FREESIDE_4_BRANCH has been updated
       via  9de321e11b1463bda7d8dc9cfa2c438c66687a4b (commit)
       via  6d70b39843cf76f10e676e1861d613b15c0bb905 (commit)
      from  650b4480c920e4d2a0d7e45cdfa2ac9ffa364f60 (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 9de321e11b1463bda7d8dc9cfa2c438c66687a4b
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Nov 28 10:30:35 2018 -0500

    RT# 81126 - fixed require svc_broadband ip check

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index d089f4105..d05ae72d0 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -97,7 +97,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table_info {
   my $conf = new FS::Conf;
-  my $ip_addr_required = $conf->exists('svc_broadband-allow_null_ip_addr');
+  my $ip_addr_required = $conf->exists('svc_broadband-allow_null_ip_addr') ? '' : '1';
   {
     'name' => 'Wireless broadband',
     'name_plural' => 'Wireless broadband services',

commit 6d70b39843cf76f10e676e1861d613b15c0bb905
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Nov 28 08:55:29 2018 -0500

    RT# 81126 - IP address field now shows required when required, IP address and Radius Group sticky on error when provisioning svc broadband

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 02136c594..d089f4105 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -96,6 +96,8 @@ points to.  You can ask the object for a copy with the I<hash> method.
 =cut
 
 sub table_info {
+  my $conf = new FS::Conf;
+  my $ip_addr_required = $conf->exists('svc_broadband-allow_null_ip_addr');
   {
     'name' => 'Wireless broadband',
     'name_plural' => 'Wireless broadband services',
@@ -117,7 +119,10 @@ sub table_info {
                          'type'     => 'fcc_477_speed',
                          'def_info' => 'both upload and download speed must be set to FCC 477 information if using that modifier',
                        },
-      'ip_addr'     => 'IP address',
+      'ip_addr'     => {
+                         'label' => 'IP address',
+                         'required' => $ip_addr_required,
+                       },
       'blocknum'    => {
                          'label'             => 'Address block',
                          'type'              => 'select',
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 2a1cca68f..1d9930adf 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -869,6 +869,7 @@ Example:
 
 my(%opt) = @_;
 
+my $conf = new FS::Conf;
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 #false laziness w/process.html
@@ -881,6 +882,8 @@ my $fields = $opt{'fields'}
 my @actualfields = map { ref($_) ? $_->{'field'} : $_ } @$fields;
 
 push @actualfields, $pkey;
+push @actualfields, 'ip_addr' if $table eq 'svc_broadband';
+push @actualfields, 'usergroup' if ($table eq 'svc_broadband' && $conf->exists('svc_broadband-radius'));
 
 my $js_form_validate = {};
 
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index d2b037053..0e9edb064 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -109,6 +109,12 @@ Example:
 
 </%doc>
 %if ( $error ) {
+%  ## flatten any array refs so multi selects are sticky on error
+%  for my $param ($cgi->param) {
+%    if (ref($cgi->param($param)) eq "ARRAY") {
+%      $cgi->param($param, (join ",", @{$cgi->param($param)}));
+%    }
+%  }
 %
 %  #my $query = $m->scomp('/elements/create_uri_query');
 %  #$cgi->redirect("$url?$query");
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index bcf55fe11..374af4770 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -109,6 +109,7 @@ my @fields = (
       return () unless $part_svc; #sanity check
       my $col = $part_svc->part_svc_column('ip_addr');
       return () unless $col; #sanity check
+      $col->set('required', 'Y') unless $conf->exists('svc_broadband-allow_null_ip_addr');
       return ('ip_addr_required' => $col->required);
     },
   },

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

Summary of changes:
 FS/FS/svc_broadband.pm                        | 7 ++++++-
 httemplate/edit/elements/edit.html            | 3 +++
 httemplate/edit/process/elements/process.html | 6 ++++++
 httemplate/edit/svc_broadband.cgi             | 1 +
 4 files changed, 16 insertions(+), 1 deletion(-)