Merge branch '6.0/add-watcher-hidden-roles' into 6.0-trunk

Author: cbrandtbuffalo

share/html/Ticket/Elements/AddWatchers

@@ -67,7 +67,7 @@
       <&/Elements/SelectWatcherType,
         Name  => "Ticket-AddWatcher-Principal-". $u->PrincipalId,
         Queue => $Ticket->QueueObj,
-        Widget => $Widget,
+        HiddenRoles => \@HiddenRoles,
       &>
     </div>
     <div class="col-9">
@@ -94,7 +94,7 @@
       <& /Elements/SelectWatcherType,
         Name  => "Ticket-AddWatcher-Principal-".$g->PrincipalId,
         Queue => $Ticket->QueueObj,
-        Widget => $Widget,
+        HiddenRoles => \@HiddenRoles,
       &>
     </div>
     <div class="col-9">
@@ -119,7 +119,7 @@
 % $counter++;
   <div class="row mt-2">
     <div class="col-3">
-      <&/Elements/SelectWatcherType, Name => "WatcherTypeEmail".$counter, Queue => $Ticket->QueueObj, Widget => $Widget &>
+      <&/Elements/SelectWatcherType, Name => "WatcherTypeEmail".$counter, Queue => $Ticket->QueueObj, HiddenRoles => \@HiddenRoles, &>
     </div>
     <div class="col-9">
       <input type="hidden" name="WatcherAddressEmail<%$counter%>" value="<%$email->format%>">
@@ -132,7 +132,7 @@
 % for my $i (1 .. 3) {
   <div class="row mt-2">
     <div class="col-3">
-      <&/Elements/SelectWatcherType, Name => "WatcherTypeEmail" . $i, Queue => $Ticket->QueueObj, %ARGS &>
+      <&/Elements/SelectWatcherType, Name => "WatcherTypeEmail" . $i, Queue => $Ticket->QueueObj, HiddenRoles => \@HiddenRoles, &>
     </div>
     <div class="col-6">
       <& /Elements/EmailInput, Name => 'WatcherAddressEmail' . $i, Size => '20', AutocompleteType => 'Principals' &>
@@ -180,5 +180,5 @@ $GroupOp => '='
 $GroupString => undef
 $PrivilegedOnly => undef
 $Ticket => undef
-$Widget => "People"
+@HiddenRoles => ()
 </%ARGS>

share/html/Ticket/Elements/EditPeople

@@ -69,7 +69,7 @@
         UserOp => $UserOp, UserField => $UserField,
         GroupString => $GroupString, GroupOp => $GroupOp,
         GroupField => $GroupField, PrivilegedOnly => $PrivilegedOnly,
-        Widget => 'People' &>
+        &>
   </div>
   <div class="boxcontainer current-watchers col-xl-6">
 <h3><&|/l&>People</&></h3>