[freeside-commits] branch master updated. 915ae2a5a5cbe3bf70a9be5024ef6323c63f47b0

[Ivan]

The branch, master has been updated
       via  915ae2a5a5cbe3bf70a9be5024ef6323c63f47b0 (commit)
      from  9e120a90dac851bec98c5bd597e690714ffd93ad (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 915ae2a5a5cbe3bf70a9be5024ef6323c63f47b0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Feb 11 17:19:02 2015 -0800

    fix inventory vs. hardware type selection, RT#33425

diff --git a/httemplate/elements/tr-select-inventory_item.html b/httemplate/elements/tr-select-inventory_item.html
index 669e85f..d7a14ec 100644
--- a/httemplate/elements/tr-select-inventory_item.html
+++ b/httemplate/elements/tr-select-inventory_item.html
@@ -12,7 +12,6 @@
 <& tr-td-label.html, %opt &>
 <TD>
 <& select-tiered.html,
-  'prefix' => $opt{'field'}.'_',
   'tiers' => [
     {
       field         => $opt{'field'}.'_classnum',
@@ -32,12 +31,15 @@
     },
   ],
   %opt,
+  'prefix' => $opt{'prefix'}. $opt{'field'}. '_', #after %opt so it overrides
 &>
 </TD>
 </TR>
 % }
 <%init>
+
 my %opt = @_;
+
 my @classnums;
 if (ref($opt{'classnum'})) {
   @classnums = @{ $opt{'classnum'} };
@@ -45,4 +47,5 @@ if (ref($opt{'classnum'})) {
   @classnums = split(',', $opt{'classnum'});
 }
 my $classnum_sql = 'classnum IN('.join(',', @classnums).')';
+
 </%init>

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

Summary of changes:
 httemplate/elements/tr-select-inventory_item.html |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)