Index: branches/5.2.x/core/units/users/users_config.php =================================================================== diff -u -N -r14663 -r14726 --- branches/5.2.x/core/units/users/users_config.php (.../users_config.php) (revision 14663) +++ branches/5.2.x/core/units/users/users_config.php (.../users_config.php) (revision 14726) @@ -1,6 +1,6 @@ Array('Status'), - 'TitleField' => 'Login', + 'TitleField' => 'Username', 'ItemType' => 6, // used for custom fields only (on user's case) @@ -294,7 +294,7 @@ 'ListSortings' => Array ( '' => Array ( - 'Sorting' => Array ('Login' => 'asc'), + 'Sorting' => Array ('Username' => 'asc'), ) ), @@ -335,7 +335,7 @@ 'default' => Array ( 'Fields' => Array ( 'PortalUserId' => Array ('default' => 0), - 'Login' => Array ( + 'Username' => Array ( 'max_len' => 255, 'formatter' => 'kFormatter', 'regexp' => '/^[A-Z\d_\-\.]+$/i', 'error_msgs' => Array( @@ -512,7 +512,7 @@ 'Fields' => Array ( 'PortalUserId' => Array ('type' => 'int', 'not_null' => 1), - 'Login' => Array ('type' => 'string', 'not_null' => 1), + 'Username' => Array ('type' => 'string', 'not_null' => 1), 'Password' => Array ('type' => 'string', 'skip_empty' => 1), 'FirstName' => Array ('type' => 'string', 'not_null' => 1), 'LastName' => Array ('type' => 'string', 'not_null' => 1), @@ -569,7 +569,7 @@ 2 => 'icon16_user_pending.png' ), 'Fields' => Array( - 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), + 'Username' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), 'LastName' => Array ('filter_block' => 'grid_like_filter'), 'FirstName' => Array ('filter_block' => 'grid_like_filter'), 'Email' => Array ('filter_block' => 'grid_like_filter'), @@ -589,7 +589,7 @@ ), 'Selector' => 'radio', 'Fields' => Array( - 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Username' => Array ('data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ), @@ -609,7 +609,7 @@ ), 'Fields' => Array ( 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70), - 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Username' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ), @@ -626,7 +626,7 @@ ), 'Fields' => Array( 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70), - 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Username' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),