Changeset 12778

Timestamp:

11/10/2020 06:10:54 PM (6 years ago)

Author:

imath

Message:

Make Member Types Admin UI more consistent with the Group Types one

Replace the select multiple control with checkboxes into the WP-Admin/Extended profile screen.

Props vapvarun

Fixes #8389

Location:

trunk/src/bp-members

Files:

• admin/css/admin-rtl.css (modified) (1 diff)
• admin/css/admin.css (modified) (1 diff)
• classes/class-bp-members-admin.php (modified) (4 diffs)

trunk/src/bp-members/admin/css/admin-rtl.css

@@ -20 +20 @@
 div#community-profile-page #profile-nav {
         margin-bottom: 1em;
-}
-
-div#community-profile-page #bp-members-profile-member-type {
-        width: 100%;
 }
 

trunk/src/bp-members/admin/css/admin.css

@@ -20 +20 @@
 div#community-profile-page #profile-nav {
         margin-bottom: 1em;
-}
-
-div#community-profile-page #bp-members-profile-member-type {
-        width: 100%;
 }
 

trunk/src/bp-members/classes/class-bp-members-admin.php

@@ -1288 +1288 @@
 
                 $types        = bp_get_member_types( array(), 'objects' );
-                $current_type = bp_get_member_type( $user->ID, false );
+                $current_type = (array) bp_get_member_type( $user->ID, false );
+                $types_count  = count( array_filter( $current_type ) );
                 ?>
 
@@ -1297 +1298 @@
                         ?>
                 </label>
-                <select name="bp-members-profile-member-type[]" id="bp-members-profile-member-type" multiple="multiple">
-                        <option value="" <?php selected( ! $current_type ); ?>>
-                                <?php
-                                        /* translators: no option picked in select box */
-                                        esc_attr_e( '----', 'buddypress' );
-                                ?>
-                        </option>
+                <ul class="categorychecklist form-no-clear">
                         <?php foreach ( $types as $type ) : ?>
-                                <option value="<?php echo esc_attr( $type->name ) ?>" <?php selected( in_array( $type->name, (array) $current_type, true ) ) ?>><?php echo esc_html( $type->labels['singular_name'] ) ?></option>
+                                <li>
+                                        <label class="selectit">
+                                                <input value="<?php echo esc_attr( $type->name ) ?>" name="bp-members-profile-member-type[]" type="checkbox" <?php checked( true, in_array( $type->name, $current_type ) ); ?>>
+                                                <?php echo esc_html( $type->labels['singular_name'] ); ?>
+                                        </label>
+                                </li>
                         <?php endforeach; ?>
-                </select>
+                        <input type="hidden" value="<?php echo intval( $types_count ); ?>" name="bp-members-profile-member-types-count" />
+                </ul>
 
                 <?php
@@ -1319 +1320 @@
          */
         public function process_member_type_update() {
-                if ( ! isset( $_POST['bp-member-type-nonce'] ) || ! isset( $_POST['bp-members-profile-member-type'] ) ) {
+                if ( ! isset( $_POST['bp-member-type-nonce'] ) || ! isset( $_POST['bp-members-profile-member-types-count'] ) ) {
                         return;
                 }
@@ -1332 +1333 @@
                 }
 
-                // Member type [string] must either reference a valid member type, or be empty.
-                $member_type = wp_parse_slug_list( wp_unslash( $_POST['bp-members-profile-member-type'] ) );
-                $member_type = array_filter( $member_type );
+                if ( isset( $_POST['bp-members-profile-member-type'] ) ) {
+                        // Member type [string] must either reference a valid member type, or be empty.
+                        $member_type = wp_parse_slug_list( wp_unslash( $_POST['bp-members-profile-member-type'] ) );
+                        $member_type = array_filter( $member_type );
+                } elseif ( 0 !== intval( $_POST['bp-members-profile-member-types-count'] ) ) {
+                        $member_type = false;
+                }
+
+                // Nothing to do there.
+                if ( ! isset( $member_type ) ) {
+                        return;
+                }
 
                 /*