[Rt-commit] rt branch, 4.6/selfservice-checkout-attachmemt-layout-fix, repushed

[Aaron Trevena]

The branch 4.6/selfservice-checkout-attachmemt-layout-fix was deleted and repushed:
       was 6bdc7a199c3658bc15dd287580c822a1219c785f
       now c99025cad0d086bebdd928a76c5ac78d324a7d89

-:  ------- > 1: 8417d0e22a Render attachment box below message box in self-service
1: 6bdc7a199c ! 2: c99025cad0 Center align fields in self-service ticket forms
    @@ -1,9 +1,8 @@
     Author: Aaron Trevena <ast at bestpractical.com>
     
    -    Render dropzone below message box in self-service
    +    Center align fields in self-service ticket forms
         
    -    Moves attachment ui to below message box, centers fields in self-service form
    -    Updated tests referring to removed text
    +    Make self-service ticket create page consistent with privileged create page.
     
     diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
     --- a/share/html/SelfService/Create.html
    @@ -63,24 +62,6 @@
      <input class="form-control" type="text" name="Subject" size="60" maxsize="200" value="<%$ARGS{Subject} || ''%>" />
      </div>
      </div>
    -@@
    -     InTable         => 1,
    -     ForCreation     => 1,
    -     &>
    --<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $queue_obj &>
    - </div>
    --<&|/l&>Describe the issue below</&>:<br />
    --<& /Elements/MessageBox, Default => $ARGS{Content} || ''  &>
    --
    -+<div class="form-group">
    -+  <& /Elements/MessageBox, Default => $ARGS{Content} || ''  &>
    -+</div>
    -+<div class="form-group">
    -+  <& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $queue_obj &>
    -+</div>
    - <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
     --- a/share/html/SelfService/Update.html
    @@ -111,12 +92,7 @@
                  <input class="form-control" type="text" name="UpdateSubject" size="60" value="<% $ARGS{UpdateSubject} || $Ticket->Subject || '' %>" />
              </div>
      
    -     </div>
    --    <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
    -     <& /Elements/EditCustomFields, Object => $Ticket &>
    - </div>
    -+<div class="form-group">
    - % if (exists $ARGS{UpdateContent}) {
    +@@
      % # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
      % my $temp = $ARGS{'QuoteTransaction'};
      % delete $ARGS{'QuoteTransaction'};
    @@ -125,31 +101,3 @@
      % $ARGS{'QuoteTransaction'} = $temp;
      % } else {
      % my $IncludeSignature = 1;
    - <& /Elements/MessageBox, Name=>"UpdateContent", IncludeSignature => $IncludeSignature, %ARGS &>
    - % }
    --    <br />
    --
    -+</div>
    -+<div class="form-group">
    -+  <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
    -+</div>
    - 
    -+<div class="form-row">
    -+  <div class="col-md-12">
    - <& /Elements/Submit, Label => loc('Update Ticket'), Name => 'SubmitTicket', id => 'SubmitTicket' &>
    -+  </div>
    -+</div>
    - 
    -   </&>
    -   </form>
    -
    -diff --git a/t/web/csrf.t b/t/web/csrf.t
    ---- a/t/web/csrf.t
    -+++ b/t/web/csrf.t
    -@@
    - is($m->response->redirects, 0, "no redirection");
    - like($m->response->request->uri, qr{^http://[^/]+\Q/SelfService/Create.html\E\?CSRF_Token=\w+$});
    - $m->title_is('Create a ticket in #1');
    --$m->content_contains('Describe the issue below:');
    - 
    - done_testing;