X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FUsers%2Findex.html;h=1873e13e402f771b4895c63602815a5181464587;hp=ec3368b3bf52f306edccd2cc37b08000e1d79b00;hb=44dd00a3ff974a17999e86e64488e996edc71e3c;hpb=919e930aa9279b3c5cd12b593889cd6de79d67bf

diff --git a/rt/share/html/Admin/Users/index.html b/rt/share/html/Admin/Users/index.html
index ec3368b3b..1873e13e4 100755
--- a/rt/share/html/Admin/Users/index.html
+++ b/rt/share/html/Admin/Users/index.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -58,19 +58,13 @@
 <input type="hidden" name="UserField" value="Name" />
 <input type="hidden" name="UserOp" value="LIKE" />
 <&|/l&>Go to user</&>
-<input type="text" name="UserString" value="" id="autocomplete-UserString" />
+<input type="text" name="UserString" value="" data-autocomplete="Users" data-autocomplete-return="Name" id="autocomplete-UserString" />
 <script type="text/javascript">
 jQuery(function(){
-    jQuery("#autocomplete-UserString").autocomplete({
-        source: <% RT->Config->Get('WebPath') |n,j%>+"/Helpers/Autocomplete/Users?return=Name",
-        // Auto-submit once a user is chosen
-        select: function( event, ui ) {
-            jQuery(event.target).val(ui.item.value);
-            var form = jQuery(event.target).closest('form');
-            form.find('input[name=UserOp]').val('=');
-            form.submit();
-        }
-    }).addClass("autocompletes-user");
+    // Jump directly to the page if a user is chosen
+    jQuery("#autocomplete-UserString").on("autocompleteselect", function( event, ui ) {
+        document.location = RT.Config.WebPath + "/Admin/Users/Modify.html?id=" + ui.item.id;
+    });
 });
 </script>
 </form>
@@ -81,8 +75,8 @@ jQuery(function(){
 <input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
 % }
 <&|/l&>Find all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields &><br />
-<input type="checkbox" class="checkbox" name="FindDisabledUsers" value="1" <% $FindDisabledUsers? 'checked="checked"': '' %> />
-<&|/l&>Include disabled users in search.</&>
+<input type="checkbox" class="checkbox" id="FindDisabledUsers" name="FindDisabledUsers" value="1" <% $FindDisabledUsers? 'checked="checked"': '' %> />
+<label for="FindDisabledUsers"><&|/l&>Include disabled users in search.</&></label>
 <br />
 <div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div> 
 </form>
@@ -95,7 +89,7 @@ jQuery(function(){
 <& /Elements/CollectionList,
     OrderBy => 'Name',
     Order => 'ASC',
-    Rows  => 100,
+    Rows  => $Rows,
     %ARGS,
     Format => $Format,
     Collection => $users,
@@ -135,13 +129,14 @@ else {
 }
 
 $Format ||= RT->Config->Get('AdminSearchResultFormat')->{'Users'};
+my $Rows = RT->Config->Get('AdminSearchResultRows')->{'Users'} || 50;
 
 # Build up the list of fields to display for searching
 my $i = 0;
 my %sorted = map { $_ => $i++ } qw(
     Name EmailAddress RealName Organization NickName WorkPhone HomePhone
     MobilePhone PagerPhone Address1 Address2 City State Zip Country
-    Timezone Lang Gecos Comments
+    Timezone Lang Gecos SMIMECertificate Comments
 );
 
 my @attrs = sort { $sorted{$a} <=> $sorted{$b} }