Index: branches/5.1.x/core/units/users/users_config.php =================================================================== diff -u -N -r14514 -r14537 --- branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 14514) +++ branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 14537) @@ -1,6 +1,6 @@ 'icon16_user_pending.png' ), 'Fields' => Array( - 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'LastName' => Array( 'title'=>'la_col_LastName', 'filter_block' => 'grid_like_filter'), - 'FirstName' => Array( 'title'=>'la_col_FirstName', 'filter_block' => 'grid_like_filter'), - 'Email' => Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'), - 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'), - 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'), - 'Modified' => Array('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter'), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'Login' => Array ('title' => 'column:la_fld_Username', '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'), + 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'), + 'Modified' => Array('filter_block' => 'grid_date_range_filter'), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), @@ -509,14 +509,14 @@ ), 'Selector' => 'radio', 'Fields' => Array( - 'Login' => Array ('title' => 'la_col_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), - 'Modified' => Array('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'Login' => Array ('title' => 'column:la_fld_Username', '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, ), + 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 150, ), + 'Modified' => Array('filter_block' => 'grid_date_range_filter', 'width' => 150, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), @@ -528,12 +528,12 @@ 2 => 'icon16_admin_disabled.png', ), 'Fields' => Array ( - 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70), - 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + '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, ), + '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, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), @@ -545,14 +545,14 @@ 2 => 'icon16_user_pending.png' ), 'Fields' => Array( - 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70), - 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + '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, ), + '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, ), 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 140), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 100), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100), 'Modified' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 100), ), ),