[freeside-commits] branch FREESIDE_2_3_BRANCH updated. ec265ee1a8291de05de6eb22b81cc575bcf36676

Ivan ivan at 420.am
Mon Mar 18 13:54:26 PDT 2013


The branch, FREESIDE_2_3_BRANCH has been updated
       via  ec265ee1a8291de05de6eb22b81cc575bcf36676 (commit)
      from  b94adce8c4acf90c01c25812a5842d4a7ca07c7d (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 ec265ee1a8291de05de6eb22b81cc575bcf36676
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Mar 18 13:54:26 2013 -0700

    add mac_addr to svc_broadband-manage_link, RT#21997

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3c47260..88da6f7 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4734,7 +4734,7 @@ and customer address. Include units.',
   {
     'key'         => 'svc_broadband-manage_link',
     'section'     => 'UI',
-    'description' => 'URL for svc_broadband "Manage Device" link.  The following substitutions are available: $ip_addr.',
+    'description' => 'URL for svc_broadband "Manage Device" link.  The following substitutions are available: $ip_addr and $mac_addr.',
     'type'        => 'text',
   },
 
diff --git a/httemplate/elements/tr-cust_svc.html b/httemplate/elements/tr-cust_svc.html
index 1ca22f6..b66654f 100644
--- a/httemplate/elements/tr-cust_svc.html
+++ b/httemplate/elements/tr-cust_svc.html
@@ -96,7 +96,8 @@ my $svc_unprovision_link =
 my $manage_link = $opt{'manage_link'};
 my $manage_target = '';
 if ( $part_svc->svcdb eq 'svc_broadband' and $manage_link ) {
-  my $ip_addr = $svc_x->ip_addr; #substitution for $manage_link
+  my $ip_addr  = $svc_x->ip_addr;  #substitution for $manage_link
+  my $mac_addr = $svc_x->mac_addr; # ditto
   $manage_link = eval(qq("$manage_link"));
   $opt{'manage_link_text'} ||= mt('Manage Device');
   $opt{'manage_link_loc'}  ||= 'bottom';

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

Summary of changes:
 FS/FS/Conf.pm                        |    2 +-
 httemplate/elements/tr-cust_svc.html |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list