projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent new "Bill now" link from futzing up later forms, RT#9193
[freeside.git]
/
httemplate
/
view
/
cust_main
/
notes.html
diff --git
a/httemplate/view/cust_main/notes.html
b/httemplate/view/cust_main/notes.html
index
833c92e
..
1283b19
100755
(executable)
--- a/
httemplate/view/cust_main/notes.html
+++ b/
httemplate/view/cust_main/notes.html
@@
-11,6
+11,9
@@
% }
<TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Note</TH>
% }
<TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Note</TH>
+% if ($curuser->access_right('Edit customer note') ) {
+ <TH CLASS="grid" BGCOLOR="#cccccc"> </TH>
+% }
</TR>
% my $bgcolor1 = '#eeeeee';
</TR>
% my $bgcolor1 = '#eeeeee';
@@
-34,7
+37,7
@@
% ";notenum=$notenum",
% 'actionlabel' => 'Edit customer note',
% 'width' => 616,
% ";notenum=$notenum",
% 'actionlabel' => 'Edit customer note',
% 'width' => 616,
-% 'height' =>
408,
+% 'height' =>
538, #575
% 'frame' => 'top',
% );
% my $clickjs = qq!onclick="$onclick"!;
% 'frame' => 'top',
% );
% my $clickjs = qq!onclick="$onclick"!;
@@
-47,11
+50,14
@@
<TR>
<% note_datestr($note,$conf,$bgcolor) %>
<TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
<TR>
<% note_datestr($note,$conf,$bgcolor) %>
<TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
- <% $note->
otaker
%>
+ <% $note->
usernum ? $note->access_user->name : $note->otaker
%>
</TD>
<TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
</TD>
<TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-
<%$note->comments%><% $edit
%>
+
<% $note->comments | defang
%>
</TD>
</TD>
+% if($edit) {
+ <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $edit %></TD>
+% }
</TR>
% } #end display notes
</TR>
% } #end display notes
@@
-61,6
+67,8
@@
% }
<%init>
% }
<%init>
+use HTML::Defang;
+
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;