[Rt-commit] rtir branch, master, updated. 4.0.1rc1-159-gc63c0a88

[? sunnavy]

The branch, master has been updated
       via  c63c0a8826e5299b64ef3f9e16d5aa58df7e3d60 (commit)
       via  3964e6ae366b6ed5296faf77f37e6527a7352800 (commit)
       via  7252d06da97132e6b1b4248eddedb5d6a6b20323 (commit)
      from  39f217426d08a15b29a2e7fddef33c22d56d07c3 (commit)

Summary of changes:
 html/RTIR/Elements/UpdateData         | 10 +++++++++-
 html/RTIR/Incident/Elements/ReplyForm |  4 ++--
 html/RTIR/Incident/Reply/index.html   |  3 ++-
 html/RTIR/Update.html                 |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 3964e6ae366b6ed5296faf77f37e6527a7352800
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Fri May 29 20:01:01 2020 -0500

    Fix messagebox color for RTIR/Incident/Reply/index.html
    
    This commits makes the messagebox colors again work consistently
    with RT.

diff --git a/html/RTIR/Incident/Elements/ReplyForm b/html/RTIR/Incident/Elements/ReplyForm
index 832f8144..0563bd7f 100644
--- a/html/RTIR/Incident/Elements/ReplyForm
+++ b/html/RTIR/Incident/Elements/ReplyForm
@@ -60,7 +60,7 @@
     <&|/l&>Update Type</&>:
   </div>
   <div class="value col-md-9">
-    <select class="selectpicker form-control" name="UpdateType">
+    <select class="selectpicker form-control" name="UpdateType" id="UpdateType">
 % if( $AllowComment ) {
       <option value="private" <% $CommentDefault %>><&|/l&>Comments (Not sent to requestors)</&></option>
 % }
@@ -113,7 +113,7 @@
   </div>
 </div>
 
-<& /RTIR/Elements/UpdateData, %ARGS, Ticket => $TicketObj, QueueObj => $QueueObj &>
+<& /RTIR/Elements/UpdateData, %ARGS, Ticket => $TicketObj, QueueObj => $QueueObj, Action => $Action &>
 
 </&>
 <%INIT>
diff --git a/html/RTIR/Incident/Reply/index.html b/html/RTIR/Incident/Reply/index.html
index 3367279d..43c4846a 100644
--- a/html/RTIR/Incident/Reply/index.html
+++ b/html/RTIR/Incident/Reply/index.html
@@ -132,6 +132,7 @@
     TicketObj   => $IncidentObj,
     Status      => $Status,
     GnuPGWidget => $gnupg_widget,
+    Action      => $Action,
 &>
 
 <div class="form-row">
@@ -286,7 +287,7 @@ $IncidentObj->CurrentUser->AddRecentlyViewedTicket($IncidentObj)
 $id              => undef
 $All             => 0
 $Status          => ''
-$Action          => 'Correspond'
+$Action          => 'Respond'
 
 $Query           => ''
 $Format          => RT->Config->Get('RTIRSearchResultFormats')->{'BulkReply'}

commit c63c0a8826e5299b64ef3f9e16d5aa58df7e3d60
Merge: 39f21742 3964e6ae
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Jun 2 23:01:10 2020 +0800

    Merge branch '5.0/fix-messagebox-colors'


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