Changeset 12039

Timestamp:

05/02/2018 04:46:28 PM (7 years ago)

Author:

imath

Message:

BP Nouveau: always include an invite screen to the Group create steps

As the Group Invites UI allows to invite friends or regular members, the Group create steps will include an invites screen even if the Friends component is not active.

Props hnla

Fixes #7781

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/groups/create-invites.php (deleted)
• buddypress/groups/create.php (modified) (2 diffs)
• includes/groups/functions.php (modified) (1 diff)
• includes/groups/template-tags.php (modified) (3 diffs)
• includes/template-tags.php (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/buddypress/groups/create.php

@@ -10 +10 @@
     <?php bp_nouveau_groups_create_hook( 'before', 'content_template' ); ?>
 
-    <form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
+    <?php if ( 'group-invites' !== bp_get_groups_current_create_step() ) : ?>
+        <form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
+    <?php else : ?>
+        <div id="create-group-form" class="standard-form">
+    <?php endif; ?>
 
         <?php bp_nouveau_groups_create_hook( 'before' ); ?>
@@ -32 +36 @@
         <?php bp_nouveau_groups_create_hook( 'after' ); ?>
 
-    </form>
+    <?php if ( 'group-invites' !== bp_get_groups_current_create_step() ) : ?>
+        </form><!-- #create-group-form -->
+    <?php else : ?>
+        </div><!-- #create-group-form -->
+    <?php endif; ?>
 
     <?php bp_nouveau_groups_create_hook( 'after', 'content_template' ); ?>

trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php

@@ -1067 +1067 @@
     // screen id => dynamic part of the hooks, nonce & specific template to use.
     $screens = array(
-        'group-details'     => array( 'hook' => 'group_details_creation_step',     'nonce' => 'groups_create_save_group-details',     'template' => 'groups/single/admin/edit-details' ),
-        'group-settings'    => array( 'hook' => 'group_settings_creation_step',    'nonce' => 'groups_create_save_group-settings',                                                     ),
-        'group-avatar'      => array( 'hook' => 'group_avatar_creation_step',      'nonce' => 'groups_create_save_group-avatar',                                                       ),
-        'group-cover-image' => array( 'hook' => 'group_cover_image_creation_step', 'nonce' => 'groups_create_save_group-cover-image',                                                  ),
-        'group-invites'     => array( 'hook' => 'group_invites_creation_step',     'nonce' => 'groups_create_save_group-invites',     'template' => 'groups/create-invites'      ),
+        'group-details' => array(
+            'hook'     => 'group_details_creation_step',
+            'nonce'    => 'groups_create_save_group-details',
+            'template' => 'groups/single/admin/edit-details',
+        ),
+        'group-settings' => array(
+            'hook'  => 'group_settings_creation_step',
+            'nonce' => 'groups_create_save_group-settings',
+        ),
+        'group-avatar' => array(
+            'hook'  => 'group_avatar_creation_step',
+            'nonce' => 'groups_create_save_group-avatar',
+        ),
+        'group-cover-image' => array(
+            'hook'  => 'group_cover_image_creation_step',
+            'nonce' => 'groups_create_save_group-cover-image',
+        ),
+        'group-invites' => array(
+            'hook'     => 'group_invites_creation_step',
+            'nonce'    => 'groups_create_save_group-invites',
+            'template' => 'common/js-templates/invites/index',
+        ),
     );
 

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

@@ -357 +357 @@
                 }
             }
-
-            wp_nonce_field( $core_screen['nonce'] );
         }
     }
@@ -414 +412 @@
     }
 
+    /**
+     * Avoid nested forms with the Backbone views for the group invites step.
+     */
+    if ( 'group-invites' === bp_get_groups_current_create_step() ) {
+        printf(
+            '<form action="%s" method="post" enctype="multipart/form-data">',
+            bp_get_group_creation_form_action()
+        );
+    }
+
+    if ( ! empty( $core_screen['nonce'] ) ) {
+        wp_nonce_field( $core_screen['nonce'] );
+    }
+
     printf(
         '<input type="hidden" name="group-id" id="group-id" value="%s" />',
@@ -437 +449 @@
          */
         do_action( 'bp_directory_groups_content' );
+    }
+
+    /**
+     * Avoid nested forms with the Backbone views for the group invites step.
+     */
+    if ( 'group-invites' === bp_get_groups_current_create_step() ) {
+        echo '</form>';
     }
 }

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

@@ -1594 +1594 @@
         }
 
-        if ( bp_is_group() && 'send-invites' === bp_current_action() ) {
+        if ( ( bp_is_group() && 'send-invites' === bp_current_action() ) || ( bp_is_group_create() && 'group-invites' === bp_get_groups_current_create_step() ) ) {
             $classes[] = 'bp-invites-nav';
         }