[freeside-commits] branch FREESIDE_3_BRANCH updated. e3e4763e500169faa7ce8bd3dba787da82edff2e

Mark Wells mark at 420.am
Thu Jan 8 14:39:32 PST 2015


The branch, FREESIDE_3_BRANCH has been updated
       via  e3e4763e500169faa7ce8bd3dba787da82edff2e (commit)
      from  26491da90aa6a1870d88be044c419be6d0b8dec0 (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 e3e4763e500169faa7ce8bd3dba787da82edff2e
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Jan 8 14:36:16 2015 -0800

    fix reason selector under mysql, #31702

diff --git a/httemplate/elements/tr-select-reason.html b/httemplate/elements/tr-select-reason.html
index 52dc956..8b43dd3 100755
--- a/httemplate/elements/tr-select-reason.html
+++ b/httemplate/elements/tr-select-reason.html
@@ -174,9 +174,14 @@ if ($class eq 'C') {
   die "illegal class: $class";
 }
 
+my $select = join(',',
+  'reason.*',
+  FS::Record::concat_sql([ 'type', "' : '", 'reason' ]) . ' AS label',
+);
+
 my @reasons = qsearch({
   'table'           => 'reason',
-  'select'          => "reason.*, (type || ' : ' || reason) AS label",
+  'select'          => $select,
   'addl_from'       => ' LEFT JOIN reason_type'.
                        ' ON (reason.reason_type = reason_type.typenum)',
   'hashref'         => { disabled => '' },

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

Summary of changes:
 httemplate/elements/tr-select-reason.html |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)




More information about the freeside-commits mailing list