[Rt-commit] rt branch, 4.4/squelching-all, repushed
Wallace Reis
wreis at bestpractical.com
Tue Aug 19 18:39:08 EDT 2014
The branch 4.4/squelching-all was deleted and repushed:
was d5700e754f9281db3942e69cee6cbfe3a8a69cde
now 5ff652157249adffeb1660fd88ea7adce6c00fbd
1: 55d5a91 = 1: 55d5a91 Sync the ckeditor output before updating messages
2: e8d4433 = 2: e8d4433 Roll back on failure to Comment, as Correspond does
3: c8a24b1 = 3: c8a24b1 DryRun now wraps in a rollback, and records all transactions
4: c948e50 = 4: c948e50 Display all scrips which are triggered
5: 4a33c66 = 5: 4a33c66 Re-use squelching information for future updates to a ticket in same request
6: 5cf9d5d = 6: 5cf9d5d Remove mostly-duplicate code for Rules which can never trigger
7: c167921 ! 7: fd9449a Add squelched recipients as preference
@@ -74,9 +74,8 @@
my %squelched = ProcessTransactionSquelching( \%ARGS );
+my $squelched_config = !( RT->Config->Get('SquelchedRecipients', $session{'CurrentUser'}) );
-+if ($ARGS{TxnRecipients}) {
-+ $squelched_config = undef;
-+}
++my %submitted;
++$submitted{$_} = 1 for split /,/, $ARGS{TxnRecipients};
</%init>
<p>
<&|/l, RT->Config->Get('WebPath')."/Ticket/ModifyPeople.html?id=".$TicketObj->Id,
@@ -85,7 +84,7 @@
% for my $addr (@addresses) {
<li>
-% my $checked = not $squelched{$addr->address};
-+% my $checked = $squelched_config // not $squelched{$addr->address};
++% my $checked = $submitted{$addr->address} ? not $squelched{$addr->address} : $squelched_config;
% $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => $addr, Type => $type, Checked => \$checked);
% $recips{$addr->address}++;
<b><%loc($type)%></b>:
@@ -98,9 +97,8 @@
my %recips;
my %squelched = ProcessTransactionSquelching( \%ARGS );
+my $squelched_config = !( RT->Config->Get('SquelchedRecipients', $session{'CurrentUser'}) );
-+if ($ARGS{TxnRecipients}) {
-+ $squelched_config = undef;
-+}
++my %submitted;
++$submitted{$_} = 1 for split /,/, $ARGS{TxnRecipients};
</%init>
<table>
% for my $type (qw(To Cc Bcc)) {
@@ -109,7 +107,7 @@
<td valign="top">
% 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};
++% my $checked = $submitted{$addr->address} ? not $squelched{$addr->address} : $squelched_config;
% $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: 0afa352 ! 8: a584086 'Select All' checkbox for scrips correspondences/comments
@@ -9,17 +9,6 @@
diff --git a/share/html/Helpers/PreviewScrips b/share/html/Helpers/PreviewScrips
--- a/share/html/Helpers/PreviewScrips
+++ b/share/html/Helpers/PreviewScrips
-@@
-
- 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>
- <p>
@@
% my @scrips = grep {$_->ActionObj->Action->isa('RT::Action::SendEmail')}
% map {@{$_->Scrips->Prepared}} @dryrun;
@@ -40,14 +29,7 @@
--- 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"';
- }
+ $submitted{$_} = 1 for split /,/, $ARGS{TxnRecipients};
</%init>
<table>
+% if ( scalar(map { keys %{$headers{$_}} } qw(To Cc Bcc)) ) {
9: d4d4993 ! 9: 896ee7a Make 'select all' check/uncheck bi-directional
@@ -25,7 +25,7 @@
--- a/share/html/Helpers/ShowSimplifiedRecipients
+++ b/share/html/Helpers/ShowSimplifiedRecipients
@@
- % my $checked = $squelched_config // not $squelched{$addr->address};
+ % my $checked = $submitted{$addr->address} ? not $squelched{$addr->address} : $squelched_config;
% $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} %>" />
10: 4f875d7 ! 10: 5a29b26 Merge checkbox click event handlers
@@ -23,7 +23,7 @@
--- a/share/html/Helpers/ShowSimplifiedRecipients
+++ b/share/html/Helpers/ShowSimplifiedRecipients
@@
- % my $checked = $squelched_config // not $squelched{$addr->address};
+ % my $checked = $submitted{$addr->address} ? not $squelched{$addr->address} : $squelched_config;
% $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} %>" onclick="checkboxSetEvent(this)" />
11: 6cae380 ! 11: 0d1015e Ticket update recipient checkboxes
@@ -3,54 +3,6 @@
Ticket update recipient checkboxes
Fix checkboxes sync state when adding one-time Cc.
-
-diff --git a/share/html/Helpers/PreviewScrips b/share/html/Helpers/PreviewScrips
---- a/share/html/Helpers/PreviewScrips
-+++ b/share/html/Helpers/PreviewScrips
-@@
-
- 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>
- <p>
-@@
- % my $action = $s->ActionObj->Action;
- % scalar(map { $action->$_ } qw(To Cc Bcc))
- % } @scrips ) {
--<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" <% $all_checkbox | n %> onclick="setCheckbox(this,'TxnSendMailTo')">
-+<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" onclick="setCheckbox(this,'TxnSendMailTo')">
- <label for="TxnSendMailToAll"><b><% loc('All recipients') %></b></label><br />
- % }
- % for my $scrip (@scrips) {
-
-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>
-@@
- <tr>
- <td> </td>
- <td>
--<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" <% $all_checkbox | n %> onclick="setCheckbox(this,'TxnSendMailTo')">
-+<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" onclick="setCheckbox(this,'TxnSendMailTo')">
- <label for="TxnSendMailToAll"><b><% loc('All recipients') %></b></label>
- </td>
- </tr>
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
--- a/share/html/Ticket/Update.html
12: d5700e7 ! 12: 5ff6521 Ticket update recipient checkboxes
@@ -11,7 +11,7 @@
% my $action = $s->ActionObj->Action;
% scalar(map { $action->$_ } qw(To Cc Bcc))
% } @scrips ) {
--<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" onclick="setCheckbox(this,'TxnSendMailTo')">
+-<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" <% $all_checkbox | n %> onclick="setCheckbox(this,'TxnSendMailTo')">
+<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1">
<label for="TxnSendMailToAll"><b><% loc('All recipients') %></b></label><br />
% }
@@ -33,13 +33,13 @@
<tr>
<td> </td>
<td>
--<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" onclick="setCheckbox(this,'TxnSendMailTo')">
+-<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1" <% $all_checkbox | n %> onclick="setCheckbox(this,'TxnSendMailTo')">
+<input type="checkbox" class="checkbox" name="TxnSendMailToAll" value="1">
<label for="TxnSendMailToAll"><b><% loc('All recipients') %></b></label>
</td>
</tr>
@@
- % my $checked = $squelched_config // not $squelched{$addr->address};
+ % my $checked = $submitted{$addr->address} ? not $squelched{$addr->address} : $squelched_config;
% $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} %>" onclick="setCheckbox(this)" />
More information about the rt-commit
mailing list