X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main_note.cgi;h=18d59e9518b30a78cf8c48bdcd5f5940004c019b;hp=9ae29c2f1842921436e5fc56c4224c1d72be3abf;hb=c49cfd25a8f92c7a2f44b51d72506a21f6b8d09f;hpb=9aee669886202be7035e6c6049fc71bc99dd3013

diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi
index 9ae29c2f1..18d59e951 100755
--- a/httemplate/edit/cust_main_note.cgi
+++ b/httemplate/edit/cust_main_note.cgi
@@ -6,14 +6,17 @@
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
 <INPUT TYPE="hidden" NAME="notenum" VALUE="<% $notenum %>">
 
-% if ($conf->exists('note-classes') && $conf->config('note-classes') > 0) {
+% if (my @noteclasses = qsearch('cust_note_class',{ 'disabled' => '' })) {
+%   my %noteclassopts = $conf->exists('cust_main_note-require_class')
+%                     ? ('disable_empty' => 1)
+%                     : ('empty_label' => '(unclassified)');
     Class &nbsp;
 	<% include( '/elements/select-table.html',
                  'table'       => 'cust_note_class',
+                 'records'     => \@noteclasses,
                  'name_col'    => 'classname',
                  'curr_value'  => $classnum,
-                 'empty_label' => '(none)',
-                 'hashref'     => { 'disabled' => '' },
+                 %noteclassopts,
          ) %>
     <BR>
 % }
@@ -26,7 +29,7 @@
     <& /elements/htmlarea.html,
          'field'      => 'comment_html',
          'curr_value' => $comment,
-         'config'     => { toolbarStartupExpanded => JSON::false,
+         'config'     => { toolbarStartupExpanded => Cpanel::JSON::XS::false,
                            height                 => 315,
                          },
     &>