[Rt-commit] rt branch, 4.2/user-search-cf-names, created. rt-4.1.8-515-g47fe706

[Alex Vandiver]

The branch, 4.2/user-search-cf-names has been created
        at  47fe706e0db5a85edc82810c08f17bcd330e383b (commit)

- Log -----------------------------------------------------------------
commit b6cfbecf79bd8eca8adebfa22ca5ad4e08997e01
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu May 30 18:08:29 2013 -0400

    Remove "CF." from custom fields used for user searching before display to the user

diff --git a/share/html/User/Search.html b/share/html/User/Search.html
index 75b3aed..6dea149 100644
--- a/share/html/User/Search.html
+++ b/share/html/User/Search.html
@@ -100,7 +100,9 @@ $users->GotoFirstItem;
 
 my $Format = RT->Config->Get('UserSearchResultFormat');
 
-my $search_fields = join ", ", map loc($_), keys %{RT->Config->Get('UserSearchFields')};
+my $search_fields = join ", ",
+  map {s/^CF\.(?:\{(.*)}|(.*))/$1 || $2/e; loc($_)}
+  keys %{RT->Config->Get('UserSearchFields')};
 
 </%INIT>
 <%ARGS>

commit 47fe706e0db5a85edc82810c08f17bcd330e383b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu May 30 18:08:43 2013 -0400

    Ensure that the fields are consistently ordered

diff --git a/share/html/User/Search.html b/share/html/User/Search.html
index 6dea149..f2868b0 100644
--- a/share/html/User/Search.html
+++ b/share/html/User/Search.html
@@ -101,7 +101,7 @@ $users->GotoFirstItem;
 my $Format = RT->Config->Get('UserSearchResultFormat');
 
 my $search_fields = join ", ",
-  map {s/^CF\.(?:\{(.*)}|(.*))/$1 || $2/e; loc($_)}
+  sort map {s/^CF\.(?:\{(.*)}|(.*))/$1 || $2/e; loc($_)}
   keys %{RT->Config->Get('UserSearchFields')};
 
 </%INIT>

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