X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main_note.cgi;h=c4ec071b82c19f24c2f5d34536c7789315fecba7;hb=38458c0c9135228828b5a477ed1710ef687ec3d3;hp=6c6a1a9a0ec2a1f1aa2120caa19afa52e9b27252;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git
diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi
index 6c6a1a9a0..c4ec071b8 100755
--- a/httemplate/edit/cust_main_note.cgi
+++ b/httemplate/edit/cust_main_note.cgi
@@ -6,11 +6,27 @@
+% if ($conf->exists('note-classes') && $conf->config('note-classes') > 0) {
+ Class
+ <% include( '/elements/select-table.html',
+ 'table' => 'cust_note_class',
+ 'name_col' => 'classname',
+ 'curr_value' => $classnum,
+ 'empty_label' => '(none)',
+ 'hashref' => { 'disabled' => '' },
+ ) %>
+
+% }
-
-
+% if( $FS::CurrentUser::CurrentUser->option('disable_html_editor') ) {
+
+% }
+% else {
+<% include('/elements/htmlarea.html', 'field' => 'comment_html',
+ 'curr_value' => $comment) %>
+% }
">
@@ -21,19 +37,26 @@
<%init>
+my $conf = new FS::Conf;
+
my $comment;
my $notenum = '';
+my $classnum;
if ( $cgi->param('error') ) {
$comment = $cgi->param('comment');
+ $classnum = $cgi->param('classnum');
} elsif ( $cgi->param('notenum') =~ /^(\d+)$/ ) {
$notenum = $1;
die "illegal query ". $cgi->keywords unless $notenum;
my $note = qsearchs('cust_main_note', { 'notenum' => $notenum });
die "no such note: ". $notenum unless $note;
$comment = $note->comments;
+ $classnum = $note->classnum;
}
-$cgi->param('custnum') =~ /^(\d+)$/ or die "illeagl custnum";
+$comment =~ s/\r//g; # remove weird line breaks to protect FCKeditor
+
+$cgi->param('custnum') =~ /^(\d+)$/ or die "illegal custnum";
my $custnum = $1;
my $action = $notenum ? 'Edit' : 'Add';