Mailing List Archive

rt branch, 4.6/core-group-management-extensions_rebase, created. rt-4.4.4-313-g11b4ccd60
The branch, 4.6/core-group-management-extensions_rebase has been created
at 11b4ccd60085b4ea7d6abd3e95a7e90ce820df7b (commit)

- Log -----------------------------------------------------------------
commit 11b4ccd60085b4ea7d6abd3e95a7e90ce820df7b
Merge: 66eba1da7 916941e53
Author: Blaine Motsinger <blaine@bestpractical.com>
Date: Fri Aug 9 15:28:03 2019 -0500

Merge branch '4.6-theme-trunk' into 4.6/core-group-management-extensions_rebase

diff --cc share/html/Admin/Queues/DefaultValues.html
index 2b94c3ec7,f415a842f..4ef6e55e8
--- a/share/html/Admin/Queues/DefaultValues.html
+++ b/share/html/Admin/Queues/DefaultValues.html
@@@ -53,31 -53,32 +53,41 @@@
<input type="hidden" name="id" value="<% $queue->id %>" />

<div class="ticket-info-basics">
- <&| /Widgets/TitleBox, title => loc('Basics') &>
- <table>
- <tr><td class="label"><&|/l&>Priority</&>:</td>
- <td><& /Elements/SelectPriority,
- Name => "InitialPriority",
- Default => $queue->DefaultValue('InitialPriority'),
- &></td></tr>
- <tr><td class="label"><&|/l&>Final Priority</&>:</td>
- <td><& /Elements/SelectPriority,
- Name => "FinalPriority",
- Default => $queue->DefaultValue('FinalPriority'),
- &><br /><span><em><&|/l&>requires running rt-crontool</&></em></span></td></tr>
- <& /Elements/EditCustomFields,
- Object => RT::Ticket->new($session{CurrentUser}),
- CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
- Grouping => 'Basics',
- InTable => 1,
- &>
-
- <tr><td class="label"><&|/l&>Article</&>:</td>
- <td><& /Elements/SelectArticle, QueueObj => $queue, Default => $queue->DefaultValue('Article'), Name => 'Article' &>
- </td></tr>
-
- </table>
- </&>
+ <&| /Widgets/TitleBox, title => loc('Basics') &>
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Priority</&>:
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/SelectPriority, Name => "InitialPriority", Default => $queue->DefaultValue('InitialPriority') &>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Final Priority</&>:
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/SelectPriority, Name => "FinalPriority", Default => $queue->DefaultValue('FinalPriority') &>
+ <span><em><&|/l&>requires running rt-crontool</&></em></span>
+ </div>
+ </div>
+
+ <& /Elements/EditCustomFields,
+ Object => RT::Ticket->new($session{CurrentUser}),
+ CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
+ Grouping => 'Basics',
+ &>
++
++ <div class="form-row">
++ <div class="col-md-3 label">
++ <&|/l&>Article</&>:
++ </div>
++ <div class="col-md-9 value">
++ <& /Elements/SelectArticle, QueueObj => $queue, Default => $queue->DefaultValue('Article'), Name => 'Article' &>
++ </div>
++ </div>
+ </&>
</div>

<div class="ticket-info-dates">
diff --cc share/html/Ticket/Create.html
index 7c1662c0d,55a220f07..11147b6ea
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@@ -245,20 -235,16 +239,18 @@@
% }
% $m->callback( %ARGS, QueueObj => $QueueObj, CallbackName => 'BeforeMessageBox' );
% if (exists $ARGS{Content}) {
-<& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => 0 &>
+<& /Elements/MessageBox, QueueObj => $QueueObj, Default => $ARGS{Content}, IncludeSignature => 0, IncludeDefaultArticle => 0 &>
+% } elsif ( $QuoteTransaction ) {
+<& /Elements/MessageBox, QueueObj => $QueueObj, QuoteTransaction => $QuoteTransaction, IncludeDefaultArticle => 0 &>
% } else {
-<& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction &>
+<& /Elements/MessageBox, QueueObj => $QueueObj, IncludeDefaultArticle => 1 &>
%}
% $m->callback( %ARGS, QueueObj => $QueueObj, CallbackName => 'AfterMessageBox' );
-
- <br />
- </td>
- </tr>
+ </span>
+ </div>

<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
- </table>
+ </div>
</&>
<& /Elements/Submit, Label => loc("Create"), id => 'SubmitTicket' &>
</div>

-----------------------------------------------------------------------
_______________________________________________
rt-commit mailing list
rt-commit@lists.bestpractical.com
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/rt-commit