[Rt-commit] rt branch, 4.4/squelching-all, repushed
Wallace Reis
wreis at bestpractical.com
Tue Jul 29 20:51:30 EDT 2014
The branch 4.4/squelching-all was deleted and repushed:
was 95bb6f37b13fda4e26e026d3b1c8171e50c8cabd
now 50a3ea4cf3e22c7c57e669981ea1c4f221c05717
1: e9df999 = 1: e9df999 Sync the ckeditor output before updating messages
2: 910a666 = 2: 910a666 Roll back on failure to Comment, as Correspond does
3: a25d722 = 3: a25d722 DryRun now wraps in a rollback, and records all transactions
4: aacb253 = 4: aacb253 Display all scrips which are triggered
5: 9c47817 = 5: 9c47817 Re-use squelching information for future updates to a ticket in same request
6: d0fc383 = 6: d0fc383 Remove mostly-duplicate code for Rules which can never trigger
7: f70de0a ! 7: 9746853 Add squelched recipients as preference
@@ -45,7 +45,7 @@
+ SortOrder => 8,
+ Widget => '/Widgets/Form/Boolean',
+ WidgetArguments => {
-+ Description => "Default to squelching all outgoing email notifications (from WebUI) on ticket update", #loc
++ Description => "Default to squelching all outgoing email notifications (from web interface) on ticket update", #loc
+ },
+ },
DisplayTicketAfterQuickCreate => {
@@ -66,34 +66,3 @@
WidgetArguments => {
Description => 'Enable quote folding?' # loc
-diff --git a/share/html/Helpers/PreviewScrips b/share/html/Helpers/PreviewScrips
---- a/share/html/Helpers/PreviewScrips
-+++ b/share/html/Helpers/PreviewScrips
-@@
- % my @addresses = $action->$type();
- % next unless @addresses;
- <ul>
-+% my $squelched_recipients = RT->Config->Get('SquelchedRecipients', $session{'CurrentUser'});
- % for my $addr (@addresses) {
- <li>
- % my $checked = not $squelched{$addr->address};
-+% $checked = $checked ? not $squelched_recipients : $checked;
- % $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => $addr, Type => $type, Checked => \$checked);
- % $recips{$addr->address}++;
- <b><%loc($type)%></b>:
-
-diff --git a/share/html/Helpers/ShowSimplifiedRecipients b/share/html/Helpers/ShowSimplifiedRecipients
---- a/share/html/Helpers/ShowSimplifiedRecipients
-+++ b/share/html/Helpers/ShowSimplifiedRecipients
-@@
- <tr>
- <td valign="top"><% $type %>:</td>
- <td valign="top">
-+% my $squelched_recipients = RT->Config->Get('SquelchedRecipients', $session{'CurrentUser'});
- % for my $addr (sort {$a->address cmp $b->address} values %{$headers{$type}}) {
- % my $checked = not $squelched{$addr->address};
-+% $checked = $checked ? not $squelched_recipients : $checked;
- % $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => $addr, Type => $type, Checked => \$checked);
- % $recips{$addr->address}++;
- <input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" />
-
8: 7215741 ! 8: d44ca9f 'Select All' checkbox for scrips correspondences/comments
@@ -13,7 +13,12 @@
$m->abort unless @dryrun;
my %squelched = ProcessTransactionSquelching( \%ARGS );
-+use Data::Dumper; warn Dumper(\%squelched);
++my $squelched_config = !( RT->Config->Get('SquelchedRecipients', $session{'CurrentUser'}) );
++my $all_checkbox = $squelched_config ? 'checked="checked"' : "";
++if ($ARGS{TxnRecipients}) {
++ $squelched_config = undef;
++ $all_checkbox = scalar(grep {$_} values %squelched) ? "" : 'checked="checked"';
++}
</%init>
<p>
<&|/l, RT->Config->Get('WebPath')."/Ticket/ModifyPeople.html?id=".$TicketObj->Id,
@@ -26,25 +31,53 @@
+% my $action = $s->ActionObj->Action;
+% scalar(map { $action->$_ } qw(To Cc Bcc))
+% } @scrips ) {
-+<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" checked="checked" onclick="setCheckbox(this,'TxnSendMailTo')">
++<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" <% $all_checkbox | n %> onclick="setCheckbox(this,'TxnSendMailTo')">
+<label for="TxnSendMailToAll"><b><% loc('All recipients') %></b></label><br />
+% }
% for my $scrip (@scrips) {
<b><% $scrip->Description || loc('Scrip #[_1]',$scrip->id) %></b><br />
<&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->Template)&>[_1] [_2] with template [_3]</&>
+@@
+ <ul>
+ % for my $addr (@addresses) {
+ <li>
+-% my $checked = not $squelched{$addr->address};
++% my $checked = $squelched_config // not $squelched{$addr->address};
+ % $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => $addr, Type => $type, Checked => \$checked);
+ % $recips{$addr->address}++;
+ <b><%loc($type)%></b>:
+@@
+ % }
+
+ % if ( $show_checkbox ) {
+- <input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" />
++ <input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" onclick="checkboxSetEvent(this,'TxnSendMailTo','TxnSendMailToAll')" />
+ % }
+-
+ <label for="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>"><& /Elements/ShowUser, Address => $addr &></label>
+ % $m->callback(CallbackName => 'AfterAddress', Ticket => $TicketObj, Address => $addr, Type => $type);
+ % unless ( $show_checkbox ) {
diff --git a/share/html/Helpers/ShowSimplifiedRecipients b/share/html/Helpers/ShowSimplifiedRecipients
--- a/share/html/Helpers/ShowSimplifiedRecipients
+++ b/share/html/Helpers/ShowSimplifiedRecipients
@@
+ }
+ my %recips;
my %squelched = ProcessTransactionSquelching( \%ARGS );
++my $squelched_config = !( RT->Config->Get('SquelchedRecipients', $session{'CurrentUser'}) );
++my $all_checkbox = $squelched_config ? 'checked="checked"' : "";
++if ($ARGS{TxnRecipients}) {
++ $squelched_config = undef;
++ $all_checkbox = scalar(grep {$_} values %squelched) ? "" : 'checked="checked"';
++}
</%init>
<table>
+% if ( scalar(map { keys %{$headers{$_}} } qw(To Cc Bcc)) ) {
+<tr>
+<td> </td>
+<td>
-+<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" checked="checked" onclick="setCheckbox(this,'TxnSendMailTo')">
++<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" <% $all_checkbox | n %> onclick="setCheckbox(this,'TxnSendMailTo')">
+<label for="TxnSendMailToAll"><b><% loc('All recipients') %></b></label>
+</td>
+</tr>
@@ -52,6 +85,19 @@
% for my $type (qw(To Cc Bcc)) {
% next unless keys %{$headers{$type}} or keys %{$no_squelch{$type}};
<tr>
+ <td valign="top"><% $type %>:</td>
+ <td valign="top">
++% my $squelched_recipients = RT->Config->Get('SquelchedRecipients', $session{'CurrentUser'});
+ % for my $addr (sort {$a->address cmp $b->address} values %{$headers{$type}}) {
+-% my $checked = not $squelched{$addr->address};
++% my $checked = $squelched_config // not $squelched{$addr->address};
+ % $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => $addr, Type => $type, Checked => \$checked);
+ % $recips{$addr->address}++;
+-<input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" />
++<input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" onclick="checkboxSetEvent(this,'TxnSendMailTo','TxnSendMailToAll')" />
+ <label for="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>"><& /Elements/ShowUser, Address => $addr &></label>
+ % $m->callback(CallbackName => 'AfterAddress', Ticket => $TicketObj, Address => $addr, Type => $type);
+ <br />
diff --git a/share/static/js/util.js b/share/static/js/util.js
--- a/share/static/js/util.js
9: 95bb6f3 ! 9: 50a3ea4 Make 'select all' check/uncheck bi-directional
@@ -5,34 +5,6 @@
If I uncheck "All $thing", and then I re-check all of the items by hand,
then "All $thing" pops back to being checked as soon as I re-checked
the last item.
-
-diff --git a/share/html/Helpers/PreviewScrips b/share/html/Helpers/PreviewScrips
---- a/share/html/Helpers/PreviewScrips
-+++ b/share/html/Helpers/PreviewScrips
-@@
- % }
-
- % if ( $show_checkbox ) {
-- <input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" />
-+ <input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" onclick="checkboxSetEvent(this,'TxnSendMailTo','TxnSendMailToAll')" />
- % }
--
- <label for="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>"><& /Elements/ShowUser, Address => $addr &></label>
- % $m->callback(CallbackName => 'AfterAddress', Ticket => $TicketObj, Address => $addr, Type => $type);
- % unless ( $show_checkbox ) {
-
-diff --git a/share/html/Helpers/ShowSimplifiedRecipients b/share/html/Helpers/ShowSimplifiedRecipients
---- a/share/html/Helpers/ShowSimplifiedRecipients
-+++ b/share/html/Helpers/ShowSimplifiedRecipients
-@@
- % $checked = $checked ? not $squelched_recipients : $checked;
- % $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => $addr, Type => $type, Checked => \$checked);
- % $recips{$addr->address}++;
--<input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" />
-+<input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" onclick="checkboxSetEvent(this,'TxnSendMailTo','TxnSendMailToAll')" />
- <label for="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>"><& /Elements/ShowUser, Address => $addr &></label>
- % $m->callback(CallbackName => 'AfterAddress', Ticket => $TicketObj, Address => $addr, Type => $type);
- <br />
diff --git a/share/static/js/util.js b/share/static/js/util.js
--- a/share/static/js/util.js
More information about the rt-commit
mailing list