diff options
author | C.J. Adams-Collier <cjac@colliertech.org> | 2014-09-09 17:42:19 -0700 |
---|---|---|
committer | C.J. Adams-Collier <cjac@colliertech.org> | 2014-09-09 17:42:19 -0700 |
commit | 9f17681a11d2e20f5baa7acf19873daf33058aa9 (patch) | |
tree | 6938c6cd13e8143589106beb2d57367e5ab5dbce /FS | |
parent | 845a6ea956c4725b800a82cc1b2ae68cd485a015 (diff) |
altered FS::UI::Web::cust_sort_fields() and cust_sql_fields() so that ->param('cust_fields') argument is no longer required
when the parameter is not passed, the initial value previously passed to cust_header() is used
if @cust_fields is empty, cust_header() is called with no arguments
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/UI/Web.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index 5fcd52220..61617060e 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -324,7 +324,7 @@ sub cust_header { } sub cust_sort_fields { - cust_header(@_); + cust_header(@_) if( @_ or !@cust_fields ); #inefficientish, but tiny lists and only run once per page map { $_ eq 'custnum' ? 'custnum' : '' } @cust_fields; @@ -346,7 +346,7 @@ sub cust_sql_fields { my @fields = qw( last first company ); # push @fields, map "ship_$_", @fields; - cust_header(@_); + cust_header(@_) if( @_ or !@cust_fields ); #inefficientish, but tiny lists and only run once per page my @location_fields; @@ -486,6 +486,7 @@ element. sub cust_fields_subs { my $unlinked_warn = 0; + return map { my $f = $_; if ( $unlinked_warn++ ) { |