[Rt-commit] rt branch 5.0.2-releng updated. rt-5.0.2beta1-4-g2b3fe23f94

[BPS Git Server]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "rt".

The branch, 5.0.2-releng has been updated
       via  2b3fe23f946ee0c4534423504b2fde141af62b78 (commit)
       via  6b56b74a3bc3d2bb562008a6a3b41da7ae2593d2 (commit)
      from  5ff120dc8c72765c683a8ace7e3797004eaae28a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2b3fe23f946ee0c4534423504b2fde141af62b78
Merge: 5ff120dc8c 6b56b74a3b
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Tue Aug 31 11:33:49 2021 -0400

    Merge branch '5.0/update-role-field-labels' into 5.0.2-releng


commit 6b56b74a3bc3d2bb562008a6a3b41da7ae2593d2
Author: craig kaiser <craig at bestpractical.com>
Date:   Mon Aug 2 08:42:08 2021 -0400

    Update principal input labels to reference groups
    
    RT 5 role inputs now accept usernames and groups and not
    just email address.

diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index a4c8135109..dafded8bca 100644
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -162,14 +162,14 @@
 
 <div class="form-row">
 <div class="label col-2"><&|/l&>Cc</&>:
-<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Sends a copy of this update to a list of email addresses. These people will receive future updates.</&>"></span>
+<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Sends a copy of this update to the provided users or groups. These people will receive future updates.</&>"></span>
 </div>
 <div class="value col-9"><& /Elements/EmailInput, Name => 'Cc', Size => undef, Default => $ARGS{Cc}, AutocompleteMultiple => 1, AutocompleteType => 'Principals' &></div>
 </div>
 
 <div class="form-row">
 <div class="label col-2"><&|/l&>Admin Cc</&>:
-<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Sends a copy of this update to a list of administrative email addresses. These people will receive future updates.</&>"></span>
+<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Sends a copy of this update to the provided users or groups. These people will receive future updates.</&>"></span>
 </div>
 <div class="value col-9"><& /Elements/EmailInput, Name => 'AdminCc', Size => undef, Default => $ARGS{AdminCc}, AutocompleteMultiple => 1, AutocompleteType => 'Principals' &></div>
 </div>
diff --git a/share/html/Ticket/Elements/AddWatchers b/share/html/Ticket/Elements/AddWatchers
index e45562ec74..306376b64a 100644
--- a/share/html/Ticket/Elements/AddWatchers
+++ b/share/html/Ticket/Elements/AddWatchers
@@ -109,7 +109,7 @@
       <&|/l&>Type</&>
     </div>
     <div class="col-9">
-      <&|/l&>Email</&>
+      <&|/l&>User or Group</&>
     </div>
   </div>
 % my $counter = 4;

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

Summary of changes:
 share/html/Ticket/Create.html          | 4 ++--
 share/html/Ticket/Elements/AddWatchers | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
rt