Changeset 12228

Timestamp:

09/07/2018 03:06:03 PM (7 years ago)

Author:

djpaul

Message:

Templates, Nouveau: fix group type default selection during group creation.

Nouveau shares the group settings options output with the create output. This
change moves the checked logic out of that relevant template, into a function,
to correct handle the default value for group creation vs. later group editing.

Fixes #7919

Props wbcomdesigns, r-a-y

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/groups/single/admin/group-settings.php (modified) (1 diff)
• includes/groups/template-tags.php (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php

@@ -72 +72 @@
             <div class="checkbox">
                 <label for="<?php printf( 'group-type-%s', $type->name ); ?>">
-                    <input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', $type->name ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php checked( bp_groups_has_group_type( bp_get_current_group_id(), $type->name ) ); ?>/> <?php echo esc_html( $type->labels['name'] ); ?>
+                    <input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', $type->name ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php bp_nouveau_group_type_checked( $type ); ?>/> <?php echo esc_html( $type->labels['name'] ); ?>
                     <?php
                     if ( ! empty( $type->description ) ) {

trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php

@@ -1369 +1369 @@
     return apply_filters( 'bp_nouveau_get_group_description_excerpt', bp_create_excerpt( $group->description, $length ), $group );
 }
+
+/**
+ * Output "checked" attribute to determine if the group type should be checked.
+ *
+ * @since 3.2.0
+ *
+ * @param object $type Group type object. See bp_groups_get_group_type_object().
+ */
+function bp_nouveau_group_type_checked( $type = null ) {
+    if ( ! is_object( $type ) ) {
+        return;
+    }
+
+    // Group creation screen requires a different check.
+    if ( bp_is_group_create() ) {
+        checked( true, ! empty( $type->create_screen_checked ) );
+    } elseif ( bp_is_group() ) {
+        checked( bp_groups_has_group_type( bp_get_current_group_id(), $type->name ) );
+    }
+}