[Rt-commit] rt branch, 4.2/user-prefs-cf-groupings, created. rt-4.2.0-30-g9f1f901

[Todd Wade]

The branch, 4.2/user-prefs-cf-groupings has been created
        at  9f1f90144d7500bcad60581ea72cb635e35a05a2 (commit)

- Log -----------------------------------------------------------------
commit 9f1f90144d7500bcad60581ea72cb635e35a05a2
Author: Todd Wade <todd at bestpractical.com>
Date:   Mon Nov 25 13:00:39 2013 -0500

    add cf groupings to user prefs page
    
    see issues#http://27333

diff --git a/share/html/User/Prefs.html b/share/html/User/Prefs.html
index e7b3c9a..0703058 100644
--- a/share/html/User/Prefs.html
+++ b/share/html/User/Prefs.html
@@ -80,6 +80,7 @@
     <td class="label"><&|/l&>Timezone</&>:</td>
     <td class="value"><& /Elements/SelectTimezone, Name => 'Timezone', Default => $UserObj->Timezone &></td>
   </tr>
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
 </table>
 </&>
 <&| /Widgets/TitleBox, title => loc('Phone numbers'), id => "user-prefs-phone" &>
@@ -100,6 +101,7 @@
     <td class="label"><&|/l&>Pager</&>:</td>
     <td class="value"><input name="PagerPhone" value="<%$UserObj->PagerPhone || ''%>" size="13" /></td>
   </tr>
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Phones', InTable => 1 &>
 </table>
 </&>
 
@@ -119,6 +121,9 @@
     User => $UserObj,
     Name => [qw(CurrentPass Pass1 Pass2)],
 &>
+
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Access control' &>
+
 </&>
 
 <&| /Widgets/TitleBox, title => loc('Location'), id => "user-prefs-location" &>
@@ -151,21 +156,15 @@
     <td class="label"><&|/l&>Country</&>:</td>
     <td class="value"><input name="Country" value="<%$UserObj->Country || ''%>" /></td>
   </tr>
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &>
 </table>
 </&>
 
-<&| /Widgets/TitleBox, title => loc('Custom Fields') &>
-<table>
-% my $CustomFields = $UserObj->CustomFields;
-% while ( my $CF = $CustomFields->Next ) {
-<tr valign="top">
-<td align="right"><% loc( $CF->Name ) %>:</td>
-<td><& /Elements/EditCustomField,
-    %ARGS, Object => $UserObj, CustomField => $CF
-&></td></tr>
-% }
-</table>
-</&>
+
+
+<& /Elements/EditCustomFieldCustomGroupings, Object => $UserObj &>
+
+
 
 <&| /Widgets/TitleBox, title => loc('Secret authentication token'), id => "user-prefs-feeds" &>
 

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