[Rt-commit] rt branch, 4.6/selfservice-checkout-attachmemt-layout-fix, created. rt-4.4.4-543-g2cda13dd97

[Aaron Trevena]

The branch, 4.6/selfservice-checkout-attachmemt-layout-fix has been created
        at  2cda13dd97269088ee72b472d94d0a4c24225b64 (commit)

- Log -----------------------------------------------------------------
commit 2cda13dd97269088ee72b472d94d0a4c24225b64
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Tue Dec 10 21:29:19 2019 +0000

    Render dropzone below message box in self-service
    
    Fixes I#222413, moves attachment ui to below message box

diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 44eb920d51..2000f72ad7 100644
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -98,11 +98,11 @@
     InTable         => 1,
     ForCreation     => 1,
     &>
-<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $queue_obj &>
 </div>
 <&|/l&>Describe the issue below</&>:<br />
 <& /Elements/MessageBox, Default => $ARGS{Content} || ''  &>
-
+  <br />
+<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $queue_obj &>
 <div class="form-row">
   <div class="col-md-12">
     <& /Elements/Submit, Label => loc("Create ticket")&>
diff --git a/share/html/SelfService/Update.html b/share/html/SelfService/Update.html
index fe49a680f2..161b77bdc5 100644
--- a/share/html/SelfService/Update.html
+++ b/share/html/SelfService/Update.html
@@ -80,7 +80,6 @@
         </div>
 
     </div>
-    <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
     <& /Elements/EditCustomFields, Object => $Ticket &>
 </div>
 % if (exists $ARGS{UpdateContent}) {
@@ -93,7 +92,8 @@
 % my $IncludeSignature = 1;
 <& /Elements/MessageBox, Name=>"UpdateContent", IncludeSignature => $IncludeSignature, %ARGS &>
 % }
-    <br />
+  <br />
+  <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
 
 
 <& /Elements/Submit, Label => loc('Update Ticket'), Name => 'SubmitTicket', id => 'SubmitTicket' &>

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