diff --git a/includes/admin/assets/css/um-admin-global.css b/includes/admin/assets/css/um-admin-global.css index 4f233bbc..fa568f62 100644 --- a/includes/admin/assets/css/um-admin-global.css +++ b/includes/admin/assets/css/um-admin-global.css @@ -131,11 +131,6 @@ a.um-delete{ color: #a00; } line-height: 37px; } -#um_edit_role #title { - width: calc( 100% - 40px ); - float:left; -} - #um-roles .row-actions .reset a { color:#a00; } diff --git a/includes/admin/core/list-tables/roles-list-table.php b/includes/admin/core/list-tables/roles-list-table.php index 05bb9120..d98f4c29 100644 --- a/includes/admin/core/list-tables/roles-list-table.php +++ b/includes/admin/core/list-tables/roles-list-table.php @@ -229,7 +229,7 @@ class UM_Roles_List_Table extends WP_List_Table { - return sprintf('%1$s %2$s', ''. ( ! empty( $item['_um_is_custom'] ) ? 'UM ' : '' ) . $item['name'] . '', $this->row_actions( $actions ) ); + return sprintf('%1$s %2$s', '' . $item['name'] . '', $this->row_actions( $actions ) ); } function column_roleid( $item ) { @@ -325,16 +325,16 @@ foreach ( $wp_roles->roles as $roleID => $role_data ) { switch( strtolower( $order ) ) { case 'asc': uasort( $roles, function( $a, $b ) { - $a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name']; - $b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name']; + //$a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name']; + //$b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name']; return strnatcmp( $a['name'], $b['name'] ); } ); break; case 'desc': uasort( $roles, function( $a, $b ) { - $a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name']; - $b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name']; + //$a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name']; + //$b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name']; return strnatcmp( $a['name'], $b['name'] ) * -1; } ); diff --git a/includes/admin/templates/role/role-edit.php b/includes/admin/templates/role/role-edit.php index 5d5186f8..8a2dc3bc 100644 --- a/includes/admin/templates/role/role-edit.php +++ b/includes/admin/templates/role/role-edit.php @@ -47,7 +47,7 @@ if ( ! empty( $_POST['role'] ) ) { $all_roles = array_keys( get_editable_roles() ); if ( 'add' == $_GET['tab'] ) { - if ( in_array( 'um_' . $id, $all_roles ) ) + if ( in_array( 'um_' . $id, $all_roles ) || in_array( $id, $all_roles ) ) $error .= __( 'Role already exists!', 'ultimate-member' ) . '
'; } @@ -118,10 +118,10 @@ $screen_id = $current_screen->id; ?>
- UM  + - UM  +
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php index 9783c7dd..64e768e5 100644 --- a/includes/core/class-fields.php +++ b/includes/core/class-fields.php @@ -2563,12 +2563,12 @@ if ( ! class_exists( 'Fields' ) ) { $res = apply_filters("um_view_field_value_{$type}", $res, $data ); - if ( $key == 'role_radio' || $key == 'role_select' ) { +/* if ( $key == 'role_radio' || $key == 'role_select' ) { $role_meta = UM()->roles()->role_data( um_user( 'role' ) ); if ( ! empty( $role_meta['is_custom'] ) ) { $res = 'UM ' . $res; } - } + }*/ $output .= '
'; $output .= '
' . $res . '
'; diff --git a/includes/core/class-roles-capabilities.php b/includes/core/class-roles-capabilities.php index 97525b73..0f96aac6 100644 --- a/includes/core/class-roles-capabilities.php +++ b/includes/core/class-roles-capabilities.php @@ -42,7 +42,7 @@ if ( ! class_exists( 'Roles_Capabilities' ) ) { foreach ( $role_keys as $role_key ) { $role_meta = get_option( "um_role_{$role_key}_meta" ); if ( $role_meta ) { - $role_meta['name'] = 'UM ' . $role_meta['name']; + //$role_meta['name'] = 'UM ' . $role_meta['name']; $roles['um_' . $role_key] = $role_meta; } } diff --git a/includes/core/class-user.php b/includes/core/class-user.php index 0bf2e5bb..bb53350e 100644 --- a/includes/core/class-user.php +++ b/includes/core/class-user.php @@ -249,7 +249,7 @@ if ( ! class_exists( 'User' ) ) { $role_meta = get_option( "um_role_{$role_key}_meta" ); if ( $role_meta ) { - $role_meta['name'] = 'UM ' . $role_meta['name']; + //$role_meta['name'] = 'UM ' . $role_meta['name']; $roles['um_' . $role_key] = $role_meta; } }