[freeside-commits] freeside/httemplate/edit cust_main_note.cgi, 1.8, 1.8.4.1 cust_note_class.html, NONE, 1.1.2.2

Erik Levinson levinse at wavetail.420.am
Wed Jan 26 21:10:12 PST 2011


Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv22046/httemplate/edit

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_main_note.cgi 
Added Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_note_class.html 
Log Message:
note classes backport to 2.1 branch, RT9995

Index: cust_main_note.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main_note.cgi,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -w -d -r1.8 -r1.8.4.1
--- cust_main_note.cgi	24 May 2010 23:54:57 -0000	1.8
+++ cust_main_note.cgi	27 Jan 2011 05:10:09 -0000	1.8.4.1
@@ -6,6 +6,18 @@
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
 <INPUT TYPE="hidden" NAME="notenum" VALUE="<% $notenum %>">
 
+% if ($conf->exists('note-classes') && $conf->config('note-classes') > 0) {
+    Class &nbsp;
+	<% include( '/elements/select-table.html',
+                 'table'       => 'cust_note_class',
+                 'name_col'    => 'classname',
+                 'curr_value'  => $classnum,
+                 'empty_label' => '(none)',
+                 'hashref'     => { 'disabled' => '' },
+         ) %>
+    <BR>
+% }
+
 % if( $FS::CurrentUser::CurrentUser->option('disable_html_editor') ) {
   <TEXTAREA NAME="comment_plain" ROWS="12" COLS="60"><% 
   join '', split /<br \/>|&nbsp;/, $comment 
@@ -25,21 +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;
 }
 
 $comment =~ s/\r//g; # remove weird line breaks to protect FCKeditor
 
-$cgi->param('custnum') =~ /^(\d+)$/ or die "illeagl custnum";
+$cgi->param('custnum') =~ /^(\d+)$/ or die "illegal custnum";
 my $custnum = $1;
 
 my $action = $notenum ? 'Edit' : 'Add';

--- NEW FILE: cust_note_class.html ---
<% include( 'elements/class_Common.html',
              'name'   => 'Customer Note Class',
              'table'  => 'cust_note_class',
          'nocat' => 1,
          )
%>




More information about the freeside-commits mailing list