From c78ac03d2e45a2979523d8c8999ab8714a58941f Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 23 Oct 2013 15:42:46 -0700
Subject: fix disabling of package and customer categories, RT#25110

---
 httemplate/edit/elements/class_Common.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit/elements')

diff --git a/httemplate/edit/elements/class_Common.html b/httemplate/edit/elements/class_Common.html
index 0a0916ebc..723227f23 100644
--- a/httemplate/edit/elements/class_Common.html
+++ b/httemplate/edit/elements/class_Common.html
@@ -30,7 +30,13 @@ unless ( $opt{'nocat'} ) {
 
 my $fields = [   'classname',
         (scalar(@category)
-          ? { field=>'categorynum', type=>'select-table', 'empty_label'=>'(none)', 'table'=>$category_table, 'name_col'=>'categoryname' }
+          ? { field       => 'categorynum',
+              type        => 'select-table',
+              table       => $category_table,
+              hashref     => { 'disabled' => '' },
+              name_col    => 'categoryname',
+              empty_label => '(none)',
+            }
           : { field=>'categorynum', type=>'hidden' }
         ),
         { field=>'disabled', type=>'checkbox', value=>'Y', },
-- 
cgit v1.2.1


From 50c2e50db2999c61db1c1c72ae416482ef370d99 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 24 Oct 2013 20:10:28 -0700
Subject: selectable choice for arbitrary fields, RT#25623

---
 httemplate/edit/elements/svc_Common.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'httemplate/edit/elements')

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 321c68545..64484eba0 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -121,6 +121,11 @@
                      $f->{'hashref'}     = {
                                             'classnum'=>$columndef->columnvalue
                                            };
+                   } elsif ( $flag eq 'S' ) { #selectable choice
+                     $f->{type}    = 'select';
+                     $f->{options} = [ split( /\s*,\s*/,
+                                                $columndef->columnvalue)
+                                     ];
                    }
 
                    if (    $f->{'type'} eq 'select-svc_pbx'
-- 
cgit v1.2.1


From 96a3ff4adba5871dae5b6f0ea657cc38fbe83513 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 24 Oct 2013 20:11:50 -0700
Subject: style

---
 httemplate/edit/elements/svc_Common.html | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit/elements')

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 64484eba0..413150858 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -101,14 +101,17 @@
 
                    my $columndef = $part_svc->part_svc_column($f->{'field'});
                    my $flag = $columndef->columnflag;
-                   if ( $flag eq 'F' ) {
+
+                   if ( $flag eq 'F' ) { #fixed
                      $f->{'type'} = length($columndef->columnvalue)
                                       ? 'fixed'
                                       : 'hidden';
                      $f->{'value'} = $columndef->columnvalue;
-                   } elsif ( $flag eq 'A' ) {
+
+                   } elsif ( $flag eq 'A' ) { #auto assign from inventory
                      $f->{'type'} = 'hidden';
-                   } elsif ( $flag eq 'M' ) {
+
+                   } elsif ( $flag eq 'M' ) { #manually assign from inventory
                      $f->{'type'} = 'select-inventory_item';
                      $f->{'empty_label'} = 'Select inventory item';
                      $f->{'extra_sql'} = 'WHERE ( svcnum IS NULL ' .
@@ -116,11 +119,13 @@
                         ')';
                      $f->{'classnum'} = $columndef->columnvalue;
                      $f->{'disable_empty'} = $object->svcnum ? 1 : 0;
-                   } elsif ( $flag eq 'H' ) {
+
+                   } elsif ( $flag eq 'H' ) { #hardware
                      $f->{'type'}        = 'select-hardware_type';
                      $f->{'hashref'}     = {
                                             'classnum'=>$columndef->columnvalue
                                            };
+
                    } elsif ( $flag eq 'S' ) { #selectable choice
                      $f->{type}    = 'select';
                      $f->{options} = [ split( /\s*,\s*/,
-- 
cgit v1.2.1