projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't link to deleted attachments if there aren't any
[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
7a19f8b
..
c02af38
100755
(executable)
--- a/
httemplate/view/cust_main/notes.html
+++ b/
httemplate/view/cust_main/notes.html
@@
-16,15
+16,6
@@
% my $notecount = scalar($cust_main->notes(0));
% if ( ! $conf->exists('cust_main-disable_notes') || $notecount) {
% my $notecount = scalar($cust_main->notes(0));
% if ( ! $conf->exists('cust_main-disable_notes') || $notecount) {
-% unless ( $view eq 'notes' && $cust_main->comments !~ /[^\s\n\r]/ ) {
-<P>
- <A NAME="cust_main_note"><FONT SIZE="+2"><% mt('Notes') |h %></FONT></A>
-</P>
-
-% }
-
-<BR>
-
% # actually display notes
<& notes/notes.html, 'cust_main' => $cust_main &>
<BR>
% # actually display notes
<& notes/notes.html, 'cust_main' => $cust_main &>
<BR>
@@
-39,7
+30,13
@@
<A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
($view ? ";show=$view" : '') . '#notes'
%>"><I>(<% mt('Show active attachments') |h %>)</I></A>
<A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
($view ? ";show=$view" : '') . '#notes'
%>"><I>(<% mt('Show active attachments') |h %>)</I></A>
-% } elsif($curuser->access_right('View deleted attachments')) {
+% } elsif ( $curuser->access_right('View deleted attachments')
+% && FS::Record->scalar_sql(
+% 'SELECT 1 FROM cust_attachment WHERE custnum = ? '.
+% ' AND disabled IS NOT NULL AND disabled > 0 LIMIT 1',
+% $custnum )
+% )
+% {
<A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
($view ? ";show=$view" : '') . ';show_deleted=1#notes'
%>"><I>(<% mt('Show deleted attachments') |h %>)</I></A>
<A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
($view ? ";show=$view" : '') . ';show_deleted=1#notes'
%>"><I>(<% mt('Show deleted attachments') |h %>)</I></A>