Merge pull request #904 from goalgorilla/feature/2973550-redirect-to-…

…group-after-join Issue #2973550 by Makishima: Fix redirection to the group after user join
goalgorilla · Jun 26, 2018 · 241733c · 241733c
2 parents ad6e99e + bf260b3
commit 241733c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/modules/social_features/social_group/social_group.module b/modules/social_features/social_group/social_group.module
@@ -488,7 +488,7 @@ function _social_group_action_form_submit($form, FormStateInterface $form_state)
     // Get form that was submitted.
     $complete_form = $form_state->getCompleteForm();
 
-    if (in_array($complete_form['#form_id'], ['group_content_' . $group->bundle() . '_membership_group-join_form', 'group_content_' . $group->bundle() . '-group_membership_add_form'])) {
+    if (in_array($complete_form['#form_id'], ['group_content_' . $group->bundle() . '-group_membership_group-join_form', 'group_content_' . $group->bundle() . '-group_membership_add_form'])) {
       // Set redirect to group home page.
       $form_state->setRedirect(
         'entity.group.canonical',

diff --git a/tests/behat/features/capabilities/group/group-create-open.feature b/tests/behat/features/capabilities/group/group-create-open.feature
@@ -73,8 +73,7 @@ Feature: Create Open Group
     And I should see the button "Cancel"
     And I should see the button "Join group"
     And I press "Join group"
-    And I should see "Test open group"
-    And I click "Test open group"
+    And I should see "Test open group" in the "Hero block"
     And I should see the button "Joined"
 
   # DS-643 As a LU I want to see the events of a group