[Rt-commit] rt branch, master, updated. rt-4.1.5-202-gc63590c
Alex Vandiver
alexmv at bestpractical.com
Sat Dec 29 00:12:00 EST 2012
The branch, master has been updated
via c63590c740189456df20efa0bb7d1effa89e3189 (commit)
via 44cc9378ddb8a8f396a8dc8729c3030d48df2e37 (commit)
via 03c3d946e6c40ea5acba701876bc09d3e5cdccb9 (commit)
via 99608123b410d197c359eff5bef72dd77bfe0867 (commit)
via ec140c79892469128bbc2a96fefb9d8087be8f44 (commit)
via ab2480060a2fe93bc1394c62b985b0ccf4829abf (commit)
via 8b0a0622cd961f3fa119f18ac56f00888510906b (commit)
via a957b4d0912767359141c020915131704be01965 (commit)
via 44e843b8b939fb70191ebdc360222f1698848981 (commit)
from c10ff30f60529fa7665f443a951850be8f14f783 (commit)
Summary of changes:
share/html/Admin/Articles/Classes/Modify.html | 30 +++++++++++++++++-----
share/html/Admin/Articles/Classes/Objects.html | 8 +++---
share/html/Admin/Articles/Classes/index.html | 3 ++-
share/html/Admin/CustomFields/Modify.html | 4 +--
share/html/Admin/CustomFields/Objects.html | 8 +++---
share/html/Admin/CustomFields/index.html | 4 +--
share/html/Admin/Elements/EditCustomField | 3 ++-
share/html/Admin/Elements/ModifyTemplate | 9 +++++--
share/html/Admin/Groups/Modify.html | 3 ++-
share/html/Admin/Groups/index.html | 3 ++-
share/html/Admin/Queues/Modify.html | 12 ++++-----
share/html/Admin/Queues/index.html | 4 +--
share/html/Admin/Users/Modify.html | 7 ++---
share/html/Admin/Users/index.html | 4 +--
share/html/Approvals/Elements/PendingMyApproval | 17 ++++++++----
share/html/Articles/Article/Elements/EditLinks | 4 +--
.../Articles/Article/Elements/ShowSearchCriteria | 4 +--
share/html/Dashboards/Subscription.html | 29 +++++++++++----------
share/html/Elements/EditCustomFieldCombobox | 3 ++-
share/html/Elements/EditLinks | 24 ++++++++---------
share/html/Prefs/Quicksearch.html | 6 +++--
share/html/Search/Bulk.html | 4 +--
share/html/Search/Elements/SelectAndOr | 4 +--
share/html/Ticket/Elements/AddAttachments | 4 ++-
share/html/Ticket/Elements/BulkLinks | 24 ++++++++---------
share/html/Ticket/Elements/Reminders | 4 +--
share/html/Ticket/Elements/UpdateCc | 7 ++---
.../Ticket/Graphs/Elements/EditGraphProperties | 10 +++++---
share/html/m/ticket/create | 3 ++-
29 files changed, 148 insertions(+), 101 deletions(-)
- Log -----------------------------------------------------------------
commit c63590c740189456df20efa0bb7d1effa89e3189
Merge: c10ff30 44cc937
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Dec 28 23:13:55 2012 -0500
Merge branch '4.2/label-fields'
Conflicts:
share/html/Admin/Articles/Classes/Modify.html
share/html/Admin/Groups/index.html
share/html/Prefs/Quicksearch.html
share/html/Ticket/Elements/Reminders
share/html/Ticket/Elements/UpdateCc
diff --cc share/html/Admin/Articles/Classes/Modify.html
index 19d819e,93ceea9..0658264
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@@ -78,39 -84,31 +84,51 @@@
<h3>When inserting articles in this class into emails:</h3>
<ul>
- <li><input type="checkbox" name="Include-Name" value="1" <% $include{Name} %>> Include article name</li>
- <li><input type="checkbox" name="Include-Summary" value="1" <% $include{Summary} %>> Include article summary</li>
+ <li>
+ <input type="checkbox" id="Include-Name" name="Include-Name" value="1" <% $include{Name} %>>
+ <label for="Include-Name"><&|/l&>Include article name</&></label>
+ </li>
+ <li>
+ <input type="checkbox" id="Include-Summary" name="Include-Summary" value="1" <% $include{Summary} %>>
+ <label for="Include-Summary"><&|/l&>Include article summary</&></label>
+ </li>
+% if ( $cfs ) {
% while (my $cf = $cfs->Next) {
<li>Include custom field '<% $cf->Name %>'
<ul>
- <li><input type="checkbox" name="Include-CF-Title-<% $cf->Id %>" <% $include{"CF-Title-".$cf->Id} %> />Title</li>
- <li><input type="checkbox" name="Include-CF-Value-<% $cf->Id %>" <% $include{"CF-Value-".$cf->Id} %> />Value</li>
+ <li>
+ <input type="checkbox" id="Include-CF-Title-<% $cf->Id %>" name="Include-CF-Title-<% $cf->Id %>" <% $include{"CF-Title-".$cf->Id} %> />
+ <label for="Include-CF-Title-<% $cf->Id %>"><&|/l&>Title</&></label>
+ </li>
+ <li>
+ <input type="checkbox" id="Include-CF-Value-<% $cf->Id %>" name="Include-CF-Value-<% $cf->Id %>" <% $include{"CF-Value-".$cf->Id} %> />
+ <label for="Include-CF-Value-<% $cf->Id %>"><&|/l&>Value</&></label>
+ </li>
</ul>
</li>
-% }
+% } }
</ul>
-<& /Elements/Submit &>
+% if ( @$subject_cfs ) {
+<h3>Change email subject:</h3>
+<p><&|/l&>If a Custom Field is selected, the Subject of your outgoing email will be overridden by this article.</&></p>
+
+<& /Widgets/Form/Select,
+ Name => 'SubjectOverride',
+ DefaultLabel => 'No Subject Override',
+ Values => $subject_cfs,
+ ValuesLabel => $subject_cf_labels,
+ CurrentValue => $ClassObj->SubjectOverride,
+&>
+% }
+
+%$m->callback( CallbackName => 'BeforeSubmit', CustomFields => $cfs, ClassObj => $ClassObj );
+
+% if ( $Create ) {
+<& /Elements/Submit, Label => loc('Create') &>
+% } else {
+<& /Elements/Submit, Label => loc('Save Changes') &>
+% }
</form>
<%INIT>
diff --cc share/html/Admin/CustomFields/Objects.html
index 771f886,cd572d3..34b8394
--- a/share/html/Admin/CustomFields/Objects.html
+++ b/share/html/Admin/CustomFields/Objects.html
@@@ -53,17 -53,17 +53,17 @@@
<form action="Objects.html" method="post">
<input type="hidden" class="hidden" name="id" value="<% $id %>" />
-% if ( $is_global ) {
+% if ( $CF->IsGlobal ) {
<h2><&|/l&>Applies to all objects</&></h2>
- <input type="checkbox" name="RemoveCustomField-<% $CF->id %>" value="0" />
- <&|/l&>check this box to remove this Custom Field from all objects and be able to choose specific objects.</&>
+ <input type="checkbox" id="RemoveCustomField-<% $CF->id %>" name="RemoveCustomField-<% $CF->id %>" value="0" />
+ <label for="RemoveCustomField-<% $CF->id %>"><&|/l&>check this box to remove this Custom Field from all objects and be able to choose specific objects.</&></label>
% } else {
<h2><&|/l&>Apply globally</&></h2>
- <input type="checkbox" name="AddCustomField-<% $CF->id %>" value="0" />
- <&|/l&>check this box to apply this Custom Field to all objects.</&>
+ <input type="checkbox" id="AddCustomField-<% $CF->id %>" name="AddCustomField-<% $CF->id %>" value="0" />
+ <label for="AddCustomField-<% $CF->id %>"><&|/l&>check this box to apply this Custom Field to all objects.</&></label>
-% unless ( $CF->ApplyGlobally ) {
+% unless ( $CF->IsOnlyGlobal ) {
<h2><&|/l&>Selected objects</&></h2>
<& /Elements/CollectionList,
OrderBy => 'id',
diff --cc share/html/Admin/Elements/EditCustomField
index 632b3d8,4b6ef3a..e461921
mode 100644,100755..100644
--- a/share/html/Admin/Elements/EditCustomField
+++ b/share/html/Admin/Elements/EditCustomField
diff --cc share/html/Admin/Elements/ModifyTemplate
index 5746c06,3e22aab..087b4a7
mode 100644,100755..100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
diff --cc share/html/Admin/Groups/Modify.html
index 808445f,9918df7..5ac8de5
mode 100644,100755..100644
--- a/share/html/Admin/Groups/Modify.html
+++ b/share/html/Admin/Groups/Modify.html
diff --cc share/html/Admin/Groups/index.html
index ef7395f,672739c..6a15471
mode 100644,100755..100644
--- a/share/html/Admin/Groups/index.html
+++ b/share/html/Admin/Groups/index.html
@@@ -47,34 -47,7 +47,35 @@@
%# END BPS TAGGED BLOCK }}}
<& /Admin/Elements/Header, Title => $title &>
<& /Elements/Tabs &>
-<% $caption %>:<br />
+<h1><% $caption %></h1>
+
+<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Groups/index.html">
+<input type="hidden" name="GroupField" value="Name" />
+<input type="hidden" name="GroupOp" value="LIKE" />
+<&|/l&>Go to group</&>
+<input type="text" name="GroupString" value="" id="autocomplete-GroupString" />
+<script type="text/javascript">
+jQuery(function(){
+ jQuery("#autocomplete-GroupString").autocomplete({
+ source: <% RT->Config->Get('WebPath') |n,j%>+"/Helpers/Autocomplete/Groups",
+ // Auto-submit once a group is chosen
+ select: function( event, ui ) {
+ jQuery(event.target).val(ui.item.value);
+ var form = jQuery(event.target).closest('form');
+ form.find('input[name=GroupOp]').val('=');
+ form.submit();
+ }
+ });
+});
+</script>
+</form>
+
+<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Groups/index.html">
+<&|/l&>Find groups whose</&> <& /Elements/SelectGroups &><br />
- <input type="checkbox" class="checkbox" name="FindDisabledGroups" value="1" <% $FindDisabledGroups? 'checked="checked"': '' |n %> /> <&|/l&>Include disabled groups in listing.</&><br />
++<input type="checkbox" class="checkbox" id="FindDisabledGroups" name="FindDisabledGroups" value="1" <% $FindDisabledGroups? 'checked="checked"': '' |n %> />
++<label for="FindDisabledGroups"><&|/l&>Include disabled groups in listing.</&></label><br />
+<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div>
+</form>
% unless ( $Groups->Count ) {
<em><&|/l&>No groups matching search criteria found.</&></em>
diff --cc share/html/Admin/Queues/Modify.html
index 0f857e8,ac549d3..5117a32
mode 100644,100755..100644
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@@ -112,17 -114,15 +112,17 @@@
% }
% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
- <tr><td align="right"><input type="checkbox" class="checkbox" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td>
- <td><&|/l&>Sign by default</&></td>
- <td align="right"><input type="checkbox" class="checkbox" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td>
- <td><&|/l&>Encrypt by default</&></td>
+ <tr><td align="right"><input type="checkbox" class="checkbox" id="Sign" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td>
+ <td><label for="Sign"><&|/l&>Sign by default</&></label></td>
+ <td align="right"><input type="checkbox" class="checkbox" id="Encrypt" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td>
+ <td><label for="Encrypt"><&|/l&>Encrypt by default</&></label></td>
</tr>
+<tr><td align="right"><input type="checkbox" class="checkbox" name="SignAuto" value="1" <% $QueueObj->SignAuto? 'checked="checked"': '' |n%> /></td>
+<td colspan="3"><&|/l_unsafe, "<b>","</b>","<i>","</i>"&>Sign all auto-generated mail. [_1]Caution[_2]: Enabling this option alters the signature from providing [_3]authentication[_4] to providing [_3]integrity[_4].</&></td></tr>
% }
- <tr><td align="right"><input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked|n%> /></td>
- <td colspan="3"><&|/l&>Enabled (Unchecking this box disables this queue)</&><br />
+ <tr><td align="right"><input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked|n%> /></td>
+ <td colspan="3"><label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this queue)</&></label><br />
% $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
</td></tr>
diff --cc share/html/Admin/Queues/index.html
index c7a4701,aefb97f..9a62f5a
mode 100644,100755..100644
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
diff --cc share/html/Admin/Users/Modify.html
index f459343,9d65f40..e321ab6
mode 100644,100755..100644
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@@ -96,17 -96,15 +96,17 @@@
<tr><td align="right">
<&|/l&>Extra info</&>:
</td><td>
-<textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo||''%></textarea>
+<textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo||$FreeformContactInfo||''%></textarea>
</td></tr>
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
</table>
</&>
+
<br />
-<&| /Widgets/TitleBox, title => loc('Access control') &>
+<&| /Widgets/TitleBox, title => loc('Access control'), class => 'user-info-access-control' &>
<input type="hidden" class="hidden" name="SetEnabled" value="1" />
- <input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked%> />
- <&|/l&>Let this user access RT</&><br />
+ <input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked%> />
+ <label for="Enabled"><&|/l&>Let this user access RT</&></label><br />
<input type="hidden" class="hidden" name="SetPrivileged" value="1" />
diff --cc share/html/Admin/Users/index.html
index adcfeb5,4795d5d..3dbfddb
mode 100644,100755..100644
--- a/share/html/Admin/Users/index.html
+++ b/share/html/Admin/Users/index.html
diff --cc share/html/Approvals/Elements/PendingMyApproval
index 169c25c,f4e923f..c4e19a8
mode 100644,100755..100644
--- a/share/html/Approvals/Elements/PendingMyApproval
+++ b/share/html/Approvals/Elements/PendingMyApproval
@@@ -55,17 -55,24 +55,24 @@@
% }
<&| /Widgets/TitleBox, title => loc("Search for approvals") &>
- <input type="checkbox" class="checkbox" value="1" name="ShowPending"
+ <input type="checkbox" class="checkbox" value="1" id="ShowPending" name="ShowPending"
<%((!$ARGS{'ShowRejected'} && !$ARGS{'ShowResolved'}) ||
$ARGS{'ShowPending'})
- && qq[checked="checked"] |n%> /> <&|/l&>Show pending requests</&><br />
- <input type="checkbox" class="checkbox" value="1" name="ShowResolved" <% defined($ARGS{'ShowResolved'}) && $ARGS{'ShowResolved'} && qq[checked="checked"] |n%> /> <&|/l&>Show approved requests</&><br />
- <input type="checkbox" class="checkbox" value="1" name="ShowRejected" <% defined($ARGS{'ShowRejected'}) && $ARGS{'ShowRejected'} && qq[checked="checked"] |n%> /> <&|/l&>Show denied requests</&><br />
- <input type="checkbox" class="checkbox" value="1" name="ShowDependent" <% defined($ARGS{'ShowDependent'}) && $ARGS{'ShowDependent'} && qq[checked="checked"] |n%> /> <&|/l&>Show requests awaiting other approvals</&><br />
+ && qq[checked="checked"] |n%> />
+ <label for="ShowPending"><&|/l&>Show pending requests</&></label><br />
+
+ <input type="checkbox" class="checkbox" value="1" id="ShowResolved" name="ShowResolved" <% defined($ARGS{'ShowResolved'}) && $ARGS{'ShowResolved'} && qq[checked="checked"] |n%> />
+ <label for="ShowResolved"><&|/l&>Show approved requests</&></label><br />
+
+ <input type="checkbox" class="checkbox" value="1" id="ShowRejected" name="ShowRejected" <% defined($ARGS{'ShowRejected'}) && $ARGS{'ShowRejected'} && qq[checked="checked"] |n%> />
+ <label for="ShowRejected"><&|/l&>Show denied requests</&></label><br />
+
+ <input type="checkbox" class="checkbox" value="1" id="ShowDependent" name="ShowDependent" <% defined($ARGS{'ShowDependent'}) && $ARGS{'ShowDependent'} && qq[checked="checked"] |n%> />
+ <label for="ShowDependent"><&|/l&>Show requests awaiting other approvals</&></label><br />
-<&|/l, qq{<input size='15' class="ui-datepicker" value='}.($created_before->Unix > 0 &&$created_before->ISO(Timezone => 'user'))."' name='CreatedBefore' id='CreatedBefore' />"&>Only show approvals for requests created before [_1]</&><br />
+<&|/l_unsafe, qq{<input size='15' class="ui-datepicker" value='}.($created_before->Unix > 0 &&$created_before->ISO(Timezone => 'user'))."' name='CreatedBefore' id='CreatedBefore' />"&>Only show approvals for requests created before [_1]</&><br />
-<&|/l, qq{<input size='15' class="ui-datepicker" value='}.( $created_after->Unix >0 && $created_after->ISO(Timezone => 'user'))."' name='CreatedAfter' id='CreatedAfter' />"&>Only show approvals for requests created after [_1]</&>
+<&|/l_unsafe, qq{<input size='15' class="ui-datepicker" value='}.( $created_after->Unix >0 && $created_after->ISO(Timezone => 'user'))."' name='CreatedAfter' id='CreatedAfter' />"&>Only show approvals for requests created after [_1]</&>
</&>
<%init>
diff --cc share/html/Elements/EditLinks
index 573797b,a2e6bc6..66a8fc6
mode 100644,100755..100644
--- a/share/html/Elements/EditLinks
+++ b/share/html/Elements/EditLinks
@@@ -52,47 -52,47 +52,47 @@@
<table>
<tr>
- <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Depends on'), Relation => 'DependsOn' &>:</td>
+ <td class="labeltop"><& ShowRelationLabel, Object => $Object, Label => loc('Depends on'), Relation => 'DependsOn' &>:</td>
<td class="value">
% while (my $link = $Object->DependsOn->Next) {
- <input type="checkbox" class="checkbox" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
- <& ShowLink, URI => $link->TargetURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink--<%$link->Type%>-<%$link->Target%>" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
+ <label for="DeleteLink--<%$link->Type%>-<%$link->Target%>"><& ShowLink, URI => $link->TargetURI &></label><br />
% }
</td>
</tr>
<tr>
- <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Depended on by'), Relation => 'DependedOnBy' &>:</td>
+ <td class="labeltop"><& ShowRelationLabel, Object => $Object, Label => loc('Depended on by'), Relation => 'DependedOnBy' &>:</td>
<td class="value">
% while (my $link = $Object->DependedOnBy->Next) {
- <input type="checkbox" class="checkbox" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
- <& ShowLink, URI => $link->BaseURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink-<%$link->Base%>-<%$link->Type%>-" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
+ <label for="DeleteLink-<%$link->Base%>-<%$link->Type%>-"><& ShowLink, URI => $link->BaseURI &></label><br />
% }
</td>
</tr>
<tr>
- <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Parents'), Relation => 'Parents' &>:</td>
+ <td class="labeltop"><& ShowRelationLabel, Object => $Object, Label => loc('Parents'), Relation => 'Parents' &>:</td>
<td class="value">
% while (my $link = $Object->MemberOf->Next) {
- <input type="checkbox" class="checkbox" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
- <& ShowLink, URI => $link->TargetURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink--<%$link->Type%>-<%$link->Target%>" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
+ <label for="DeleteLink--<%$link->Type%>-<%$link->Target%>"><& ShowLink, URI => $link->TargetURI &></label><br />
% }
</td>
</tr>
<tr>
- <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Children'), Relation => 'Children' &>:</td>
+ <td class="labeltop"><& ShowRelationLabel, Object => $Object, Label => loc('Children'), Relation => 'Children' &>:</td>
<td class="value">
% while (my $link = $Object->Members->Next) {
- <input type="checkbox" class="checkbox" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
- <& ShowLink, URI => $link->BaseURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink-<%$link->Base%>-<%$link->Type%>-" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
+ <label for="DeleteLink-<%$link->Base%>-<%$link->Type%>-"><& ShowLink, URI => $link->BaseURI &></label><br />
% }
</td>
</tr>
<tr>
- <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Refers to'), Relation => 'RefersTo' &>:</td>
+ <td class="labeltop"><& ShowRelationLabel, Object => $Object, Label => loc('Refers to'), Relation => 'RefersTo' &>:</td>
<td class="value">
% while (my $link = $Object->RefersTo->Next) {
- <input type="checkbox" class="checkbox" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
- <& ShowLink, URI => $link->TargetURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink--<%$link->Type%>-<%$link->Target%>" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
+ <label for="DeleteLink--<%$link->Type%>-<%$link->Target%>"><& ShowLink, URI => $link->TargetURI &></label><br />
%}
</td>
</tr>
diff --cc share/html/Prefs/Quicksearch.html
index ea820fa,aa7c814..c189dff
--- a/share/html/Prefs/Quicksearch.html
+++ b/share/html/Prefs/Quicksearch.html
@@@ -57,7 -57,9 +57,9 @@@
% unless ($unwanted->{$queue->Name}) {
checked="checked"
% }
- /><%$queue->Name%><% $queue->Description ? ': '.$queue->Description : '' %></li>
+ />
-<label for="Want-<%$queue->Name%>"><%$queue->Name%>: <%$queue->Description%></label>
++<label for="Want-<%$queue->Name%>"><%$queue->Name%><% $queue->Description ? ': '.$queue->Description : '' %></label>
+ </li>
% }
</ul>
<& /Elements/Submit, CheckAll => 1, ClearAll => 1, Caption => loc("Save Changes"), Label => loc('Save'), Name => 'Save'&>
diff --cc share/html/Search/Bulk.html
index 66a168d,dec03b7..2a74778
mode 100644,100755..100644
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
diff --cc share/html/Ticket/Elements/BulkLinks
index 8210da8,7853af5..9e4fa3e
mode 100644,100755..100644
--- a/share/html/Ticket/Elements/BulkLinks
+++ b/share/html/Ticket/Elements/BulkLinks
diff --cc share/html/Ticket/Elements/Reminders
index 5e0578d,21b8cf6..906074b
--- a/share/html/Ticket/Elements/Reminders
+++ b/share/html/Ticket/Elements/Reminders
@@@ -197,9 -196,9 +197,9 @@@ $Inde
<td class="collection-as-table">
% unless ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
<input name="Complete-Reminder-<% $Reminder->id %>" type="hidden"
-value=<% $Reminder->Status eq 'resolved' ? 1 : 0 %> />
+value=<% $Reminder->Status eq $Reminder->Lifecycle->ReminderStatusOnResolve ? 1 : 0 %> />
% }
- <input type="checkbox" value="1" name="Complete-Reminder-<% $Reminder->id %>" <% $Reminder->Status eq $Reminder->Lifecycle->ReminderStatusOnResolve ? 'checked="checked"' : '' |n %>
-<input type="checkbox" value="1" id="Complete-Reminder-<% $Reminder->id %>" name="Complete-Reminder-<% $Reminder->id %>" <% $Reminder->Status eq 'resolved' ? 'checked="checked"' : '' |n %>
++<input type="checkbox" value="1" id="Complete-Reminder-<% $Reminder->id %>" name="Complete-Reminder-<% $Reminder->id %>" <% $Reminder->Status eq $Reminder->Lifecycle->ReminderStatusOnResolve ? 'checked="checked"' : '' |n %>
% unless ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
disabled="disabled"
% }
diff --cc share/html/Ticket/Elements/UpdateCc
index d062156,be5f863..b7ea5e3
--- a/share/html/Ticket/Elements/UpdateCc
+++ b/share/html/Ticket/Elements/UpdateCc
@@@ -61,8 -61,10 +61,9 @@@
class="onetime onetimecc"
type="checkbox"
% my $clean_addr = $txn_addresses{$addr}->format;
-% $clean_addr =~ s/'/\\'/g;
- onClick="checkboxToInput('UpdateCc', 'UpdateCc-<%$addr%>','<%$clean_addr%>' );"
+ onClick="checkboxToInput('UpdateCc', <% "UpdateCc-$addr" |n,j%>, <%$clean_addr|n,j%> );"
- <% $ARGS{'UpdateCc-'.$addr} ? 'checked="checked"' : ''%> > <& /Elements/ShowUser, Address => $txn_addresses{$addr}&>
+ <% $ARGS{'UpdateCc-'.$addr} ? 'checked="checked"' : ''%> >
+ <label for="UpdateCc-<%$addr%>"><& /Elements/ShowUser, Address => $txn_addresses{$addr}&></label>
%}
</td></tr>
<tr><td class="label"><&|/l&>One-time Bcc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc} &><br />
@@@ -76,9 -78,10 +77,9 @@@
class="onetime onetimebcc"
type="checkbox"
% my $clean_addr = $txn_addresses{$addr}->format;
-% $clean_addr =~ s/'/\\'/g;
- onClick="checkboxToInput('UpdateBcc', 'UpdateBcc-<%$addr%>','<%$clean_addr%>' );"
+ onClick="checkboxToInput('UpdateBcc', <% "UpdateBcc-$addr" |n,j%>, <%$clean_addr|n,j%> );"
- <% $ARGS{'UpdateBcc-'.$addr} ? 'checked="checked"' : ''%>>
- <& /Elements/ShowUser, Address => $txn_addresses{$addr}&>
+ <% $ARGS{'UpdateBcc-'.$addr} ? 'checked="checked"' : ''%> >
+ <label for="UpdateBcc-<%$addr%>"><& /Elements/ShowUser, Address => $txn_addresses{$addr}&></label>
%}
</td></tr>
<%args>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list