Changeset 11345

Timestamp:

12/26/2016 09:51:30 PM (10 years ago)

Author:

slaffik

Message:

Profile: redirect to group after profile field deleted.

When deleting a profile field we should redirect back to a fields group, where the field was deleted from. That's a UX improvement.

Props rogercoathup, DJPaul.
Fixes #4646.

File:

• trunk/src/bp-xprofile/bp-xprofile-admin.php (modified) (2 diffs)

trunk/src/bp-xprofile/bp-xprofile-admin.php

@@ -561 +561 @@
         global $field;
 
-        $field = $admin_field; ?>
-
-        <fieldset id="draggable_field_<?php echo esc_attr( $field->id ); ?>"class="sortable<?php echo ' ' . $field->type; if ( !empty( $class ) ) echo ' ' . $class; ?>">
+        $field = $admin_field;
+
+        $field_edit_url = add_query_arg(
+                array(
+                        'page'     => 'bp-profile-setup',
+                        'group_id' => (int) $field->group_id,
+                        'field_id' => (int) $field->id,
+                        'mode'     => 'edit_field'
+                ),
+                admin_url( 'users.php' )
+        );
+
+        if ( $field->can_delete ) {
+                $field_delete_url = add_query_arg(
+                        array(
+                                'page'     => 'bp-profile-setup',
+                                'field_id' => (int) $field->id,
+                                'mode'     => 'delete_field'
+                        ),
+                        admin_url( 'users.php' ) . '#tabs-' . (int) $field->group_id
+                );
+        }
+        ?>
+
+        <fieldset id="draggable_field_<?php echo esc_attr( $field->id ); ?>" class="sortable<?php echo ' ' . $field->type; if ( !empty( $class ) ) echo ' ' . $class; ?>">
                 <legend>
                         <span>
@@ -614 +636 @@
 
                         <div class="actions">
-                                <a class="button edit" href="users.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $admin_group->id ); ?>&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ); ?></a>
+                                <a class="button edit" href="<?php echo esc_url( $field_edit_url ); ?>"><?php _e( 'Edit', 'buddypress' ); ?></a>
 
                                 <?php if ( $field->can_delete ) : ?>
 
                                         <div class="delete-button">
-                                                <a class="confirm submit-delete deletion" href="users.php?page=bp-profile-setup&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ); ?></a>
+                                                <a class="confirm submit-delete deletion" href="<?php echo esc_url( $field_delete_url ); ?>"><?php _e( 'Delete', 'buddypress' ); ?></a>
                                         </div>