[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-204-ge8c92bd

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  e8c92bd2c9f3c12fa1207f660c1cf8af84e7d8fa (commit)
      from  c73df98e53258766f25ae49fee44c9176037d484 (commit)

Summary of changes:
 share/html/Search/Bulk.html        |   15 ++-------------
 share/html/SelfService/Update.html |   23 +----------------------
 share/html/Ticket/Create.html      |   24 ++----------------------
 share/html/Ticket/ModifyAll.html   |   18 ++----------------
 4 files changed, 7 insertions(+), 73 deletions(-)

- Log -----------------------------------------------------------------
commit e8c92bd2c9f3c12fa1207f660c1cf8af84e7d8fa
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Aug 4 10:29:48 2010 -0400

    Use the new AddAttachments component elsewhere

diff --git a/share/html/Search/Bulk.html b/share/html/Search/Bulk.html
index be06e38..b9bec56 100755
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@ -153,20 +153,9 @@ size="60" value="<% $ARGS{UpdateSubject} || "" %>" /></td></tr>
     &><em><% $CF->FriendlyType %></em></td>
 </td></tr>
 % } # end if while
-% if (exists $session{'Attachments'}) {
-<tr><td><&|/l&>Attached file</&>:</td>
-<td>
-<&|/l&>Check box to delete</&><br />
-% foreach my $attach_name (keys %{$session{'Attachments'}}) {
-<input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
-% } # end of foreach
-</td>
-</tr>
-% } # end of if
 
- <tr><td align="right"><&|/l&>Attach</&>:</td><td><input name="Attach" type="file" />
-    <input type="submit" class="button" name="AddMoreAttach" value="<&|/l&>Add More Files</&>" />
-    <input type="hidden" class="hidden" name="UpdateAttach" value="1" /></td></tr>
+<& /Ticket/Elements/AddAttachments, %ARGS &>
+
  <tr><td class="labeltop"><&|/l&>Message</&>:</td><td>
 %# Currently, bulk update always starts with Comment not Reply selected, so we check this unconditionally
 % my $IncludeSignature = RT->Config->Get('MessageBoxIncludeSignatureOnComment');
diff --git a/share/html/SelfService/Update.html b/share/html/SelfService/Update.html
index 4e9f80e..d208356 100755
--- a/share/html/SelfService/Update.html
+++ b/share/html/SelfService/Update.html
@@ -72,28 +72,7 @@
         </td>
 
     </tr>
-% if (exists $session{'Attachments'}) {
-<tr>
-    <td class="label">
-    <&|/l&>Attached file</&>
-    </td>
-    <td colspan="5" class="value">
-    <&|/l&>Check box to delete</&><br />
-% foreach my $attach_name (keys %{$session{'Attachments'}}) {
-    <input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
-% } # end of foreach
-    </td>
-</tr>
-% } # end of if
-<tr>
-    <td class="label">
-        <&|/l&>Attach</&>
-    </td>
-    <td class="value">
-            <input name="Attach" type="file" />
-            <input type="hidden" class="hidden" name="UpdateAttach" value="1" />
-    </td>
-  </tr>
+    <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
 </table>
 <& /Ticket/Elements/EditCustomFields,  TicketObj => $Ticket &>
 <& /Elements/MessageBox, 
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index 15bf50e..6ccc9cc 100755
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -121,28 +121,8 @@
 </td>
 </tr>
 <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj &>
-<tr>
-% if (exists $session{'Attachments'}) {
-<td class="label">
-<&|/l&>Attached file</&>:
-</td>
-<td colspan="5">
-<&|/l&>Check box to delete</&><br />
-% foreach my $attach_name (keys %{$session{'Attachments'}}) {
-<input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
-% } # end of foreach
-</td>
-</tr>
-<tr>
-% } # end of if
-<td class="label">
-<&|/l&>Attach file</&>:
-</td>
-<td class="value" colspan="5">
-<input type="file" name="Attach" />
-<input type="submit" class="button" name="AddMoreAttach" value="<&|/l&>Add More Files</&>" />
-</td>
-</tr>
+
+<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
 
 % if ( $gnupg_widget ) {
 <tr><td>&nbsp;</td><td colspan="5">
diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 3fe2871..0979006 100755
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -115,23 +115,9 @@
 </td></tr>
 %    } # end if while
 % } # end of if
-% if (exists $session{'Attachments'}) {
-<tr><td><&|/l&>Attached file</&>:</td>
-<td>
-<&|/l&>Check box to delete</&><br />
-% foreach my $attach_name (keys %{$session{'Attachments'}}) {
-<input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
-% } # end of foreach
-</td>
-</tr>
-% } # end of if
 
-  <tr>
-    <td class="label"><&|/l&>Attach</&>:</td>
-    <td class="entry"><input name="Attach" type="file" />
-    <input type="submit" class="button" name="AddMoreAttach" value="<&|/l&>Add More Files</&>" />
-    <input type="hidden" class="hidden" name="UpdateAttach" value="1" /></td>
-  </tr>
+<& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
+
   <tr>
     <td class="labeltop"><&|/l&>Content</&>:</td>
     <td class="entry">

-----------------------------------------------------------------------