[freeside-commits] branch FREESIDE_2_3_BRANCH updated. d4617c6565d5fc6bafe14d11c19646b0674ae73d

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  d4617c6565d5fc6bafe14d11c19646b0674ae73d (commit)
      from  6e4d06796d675b730ddb5c2c47fc5e3be2d6fc38 (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 d4617c6565d5fc6bafe14d11c19646b0674ae73d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jun 1 17:15:12 2012 -0700

    last bit of cust_main-custom-content on 2.3

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index dcadf99..b403350 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -272,7 +272,13 @@ function areyousure(href, message) {
 % }
 
 % if ( $view eq 'custom' ) { 
+%   if ( $conf->config('cust_main-custom_link') ) {
 <& cust_main/custom.html, $cust_main &>
+%   } elsif ( $conf->config('cust_main-custom_content') ) {
+      <& cust_main/custom_content.html, $cust_main &>
+%   #} else {
+%   #  warn "custom view without cust_main-custom_link or -custom_content?";
+%   }
 % }
 
 </DIV>
@@ -321,7 +327,8 @@ $views{emt('Payment History')} =  'payment_history'
 $views{emt('Change History')}  =  'change_history'
   if $curuser->access_right('View customer history');
 $views{$conf->config('cust_main-custom_title') || emt('Custom')} =  'custom'
-  if $conf->config('cust_main-custom_link');
+  if $conf->config('cust_main-custom_link')
+  || $conf->config('cust_main-custom_content');
 $views{emt('Jumbo')}           =  'jumbo';
 
 my %viewname = reverse %views;

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

Summary of changes:
 httemplate/view/cust_main.cgi |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)