X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fattachments.html;h=bdd4f59170b57037da33df669f1147970f321ff0;hb=aa93abfbe3967fdc6b6c01636c02b8340d261c40;hp=e25814ff5926aa2d99b8171c6d22f38cb558951a;hpb=283ea2b5137ae3ec36882b492e6de024b0ce6027;p=freeside.git

diff --git a/httemplate/view/cust_main/attachments.html b/httemplate/view/cust_main/attachments.html
index e25814ff5..bdd4f5917 100755
--- a/httemplate/view/cust_main/attachments.html
+++ b/httemplate/view/cust_main/attachments.html
@@ -11,6 +11,7 @@
 %   }
     <TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
     <TH CLASS="grid" BGCOLOR="#cccccc">Filename</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
     <TH CLASS="grid" BGCOLOR="#cccccc">Type</TH>
     <TH CLASS="grid" BGCOLOR="#cccccc">Size</TH>
     <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
@@ -19,9 +20,19 @@
 % my $bgcolor1 = '#eeeeee';
 % my $bgcolor2 = '#ffffff';
 % my $bgcolor = '';
+% if($cgi->param('show_deleted')) {
+%   if ($curuser->access_right('View deleted attachments')) {
+%     @attachments = grep { $_->disabled } @attachments;
+%   }
+%   else {
+%     @attachments = ();
+%   }
+% }
+% else {
+%   @attachments = grep { not $_->disabled } @attachments;
+% }
 %
-% foreach my $attach ((grep { $_->disabled } @attachments),
-%                     (grep { ! $_->disabled } @attachments)) {
+% foreach my $attach (@attachments) {
 %
 %   if ( $bgcolor eq $bgcolor1 ) {
 %     $bgcolor = $bgcolor2;
@@ -32,64 +43,61 @@
 %   my $pop = popurl(3);
 %   my $attachnum = $attach->attachnum;
 %   my $edit = '';
-%   my $download = '';
-%   if($attach->disabled) {
-%     my $onclick = include('/elements/popup_link_onclick.html',
-%                            'action'   => popurl(2).
-%                                         'edit/process/cust_main_attach.cgi'.
-%                                         "?custnum=$custnum;".
-%                                         "attachnum=$attachnum;".
-%                                         "undelete=1",
-%                            'actionlabel' => 'Undelete attachment',
-%                            'width'       => 616,
-%                            'height'      => 408,
-%                            'frame'       => 'top',
-%                         );
-%     my $clickjs = qq!onclick="$onclick"!;
-%     if($curuser->access_right('Edit attachment')) {
-%       $edit = qq! <A HREF="javascript:void(0);" $clickjs>(undelete)</A>!;
+%   if($attach->disabled) { # then you can undelete it or purge it.
+%     if ($curuser->access_right('Undelete attachment')) {
+%       my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
+%                           "custnum=$custnum;attachnum=$attachnum;".
+%                           "undelete=1",
+%                           'Undelete attachment');
+%       $edit .= qq!&nbsp; <A HREF="javascript:void(0);" $clickjs>(undelete)</A>!;
+%     }
+%     if ($curuser->access_right('Purge attachment')) {
+%       my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
+%                           "custnum=$custnum;attachnum=$attachnum;".
+%                           "purge=1",
+%                           'Purge attachment',
+%                           'Permanently remove this file?');
+%       $edit .= qq!&nbsp; <A HREF="javascript:void(0);" $clickjs>(purge)</A>!;
 %     }
 %   }
-%   else {
-%     my $onclick = include( '/elements/popup_link_onclick.html',
-%                              'action'      => popurl(2).
-%                                               'edit/cust_main_attach.cgi'.
-%                                               "?custnum=$custnum".
-%                                               ";attachnum=$attachnum",
-%                              'actionlabel' => 'Edit customer note',
-%                              'width'       => 616,
-%                              'height'      => 408,
-%                              'frame'       => 'top',
-%                          );
-%     my $clickjs = qq!onclick="$onclick"!;
-%
+%   else { # you can download or edit it
 %     if ($curuser->access_right('Edit attachment') ) {
-%       $edit = qq! <A HREF="javascript:void(0);" $clickjs>(edit)</A>!;
+%       my $clickjs = popup('edit/cust_main_attach.cgi?'.
+%                           "custnum=$custnum;attachnum=$attachnum",
+%                           'Edit attachment properties');
+%       $edit .= qq!&nbsp; <A HREF="javascript:void(0);" $clickjs>(edit)</A>!;
+%     }
+%     if($curuser->access_right('Delete attachment') ) {
+%       my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
+%                           "custnum=$custnum;attachnum=$attachnum;delete=1",
+%                           'Delete attachment',
+%                           'Delete this file?');
+%       $edit .= qq!&nbsp; <A HREF="javascript:void(0);" $clickjs>(delete)</A>!;
 %     }
 %     if ($curuser->access_right('Download attachment') ) {
-%       $download = qq! <A HREF="!.popurl(1).'attachment.html?'.$attachnum.qq!">(download)</A>!;
+%       $edit .= qq!&nbsp; <A HREF="!.popurl(1).'attachment.html?'.$attachnum.qq!">(download)</A>!;
 %     }
 %   }
 
     <TR>
       <% note_datestr($attach,$conf,$bgcolor) %>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-        &nbsp;<% $attach->otaker%>
+        &nbsp;<% $attach->usernum ? $attach->access_user->name : $attach->otaker %>
       </TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
        &nbsp;<% $attach->filename %>
       </TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+       &nbsp;<% $attach->title %>
+      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
        &nbsp;<% $attach->mime_type %>
       </TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
        &nbsp;<% size_units( $attach->size ) %>
       </TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-        &nbsp;<% $edit %>
-        &nbsp;<% $download %>
+       <% $edit %>
       </TD>
-      <% $attach->disabled ? '</I>' : '' %>
     </TR>
 
 % } #end display notes
@@ -101,7 +109,7 @@
 
 my $conf = new FS::Conf;
 my $curuser = $FS::CurrentUser::CurrentUser;
-
+die "access denied" if !$curuser->access_right('View attachments');
 my(%opt) = @_;
 
 my $custnum = $opt{'custnum'};
@@ -130,4 +138,19 @@ sub size_units {
   return int($bytes / 1048576)."M";
 }
 
+sub popup {
+  my ($url, $label, $confirm) = @_;
+  my $onclick = 
+    include('/elements/popup_link_onclick.html',
+      'action'     => popurl(2).$url,
+      'actionlabel' => $label,
+      'width'       => 510,
+      'height'      => 315,
+      'frame'       => 'top',
+    );
+  $onclick = qq!if(confirm('$confirm')) { $onclick }! if $confirm;
+  return qq!onclick="$onclick"!;
+}
+
+
 </%init>