[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 4541332ec8410303ebe630ce5fd37cf5bf8c6719

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  4541332ec8410303ebe630ce5fd37cf5bf8c6719 (commit)
      from  acd68a24195f6e2bd65d58833047256fafba6e13 (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 4541332ec8410303ebe630ce5fd37cf5bf8c6719
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue May 8 21:53:19 2012 -0700

    remove agent_svcid from cust_svc->label and instead put it explicity in customer package/service view & service search results, RT#17619

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 1ae46fb..ff8ba9f 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -439,12 +439,9 @@ sub svc_label_long { shift->_svc_label('label_long', @_); }
 sub _svc_label {
   my( $self, $method, $svc_x ) = ( shift, shift, shift );
 
-  my $identifier = $svc_x->$method(@_);
-  $identifier = '['.$self->agent_svcid.']'. $identifier if $self->agent_svcid;
-
   (
     $self->part_svc->svc,
-    $identifier,
+    $svc_x->$method(@_),
     $self->part_svc->svcdb,
     $self->svcnum
   );
diff --git a/httemplate/elements/tr-cust_svc.html b/httemplate/elements/tr-cust_svc.html
index ca5de86..1ca22f6 100644
--- a/httemplate/elements/tr-cust_svc.html
+++ b/httemplate/elements/tr-cust_svc.html
@@ -24,7 +24,7 @@ Usage:
   <TD ALIGN="right" VALIGN="top"><% 
 FS::UI::Web::svc_link($m, $part_svc, $cust_svc)
 %></TD>
-  <TD STYLE="padding-bottom:0px"><B><%
+  <TD STYLE="padding-bottom:0px"><B><% $cust_svc->agent_svcid ? $cust_svc->agent_svcid.': ' : '' %><%
 FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc)
 %></B></TD>
 <TD ALIGN="right"><% FS::UI::Web::svc_export_links($m, $part_svc, $cust_svc) %>
diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index 585431e..2adcbd7 100644
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -13,7 +13,10 @@
 	                         sub { 
 				   #$_[0]->svc. ': '. $_[0]->label;
 				   my($label, $value, $svcdb) = $_[0]->label;
-				   "$label: $value";
+                                   my $id = $_[0]->agent_svcid
+                                              ? $_[0]->agent_svcid.': '
+                                              : '';
+				   "$label: $id$value";
 				 },
 				 # package?
 				 \&FS::UI::Web::cust_fields,

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

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