Changeset 49944

Timestamp:

01/07/2021 04:21:09 PM (4 years ago)

Author:

johnbillion

Message:

Quick/Bulk Edit: By the power vested in me, I hereby declare the top bulk actions and the bottom bulk actions joined forever in MatrimonyScript.

This joyous marriage means that users will no longer find a selected top bulk action on a list table unexpectedly being applied instead of their selected bottom bulk action. The top and bottom controls for changing user roles are equally wedded forever too.

Props clayray, subrataemfluence, garrett-eclipse, pbiron, hareesh-pillai

Fixes #46872

Location:

trunk/src

Files:

• js/_enqueues/admin/common.js (modified) (2 diffs)
• js/_enqueues/admin/edit-comments.js (modified) (1 diff)
• js/_enqueues/admin/inline-edit-post.js (modified) (1 diff)
• js/_enqueues/admin/media.js (modified) (1 diff)
• wp-admin/css/forms.css (modified) (1 diff)
• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/includes/class-wp-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-terms-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-users-list-table.php (modified) (1 diff)
• wp-admin/network/site-users.php (modified) (1 diff)
• wp-admin/network/sites.php (modified) (1 diff)
• wp-admin/network/users.php (modified) (1 diff)
• wp-admin/users.php (modified) (1 diff)

trunk/src/js/_enqueues/admin/common.js

@@ -1221 +1221 @@
 
     /**
+     * Marries a secondary control to its primary control.
+     *
+     * @param {jQuery} topSelector    The top selector element.
+     * @param {jQuery} topSubmit      The top submit element.
+     * @param {jQuery} bottomSelector The bottom selector element.
+     * @param {jQuery} bottomSubmit   The bottom submit element.
+     * @return {void}
+     */
+    function marryControls( topSelector, topSubmit, bottomSelector, bottomSubmit ) {
+        /**
+         * Updates the primary selector when the secondary selector is changed.
+         *
+         * @since 5.7.0
+         *
+         * @return {void}
+         */
+        function updateTopSelector() {
+            topSelector.val($(this).val());
+        }
+        bottomSelector.on('change', updateTopSelector);
+
+        /**
+         * Updates the secondary selector when the primary selector is changed.
+         *
+         * @since 5.7.0
+         *
+         * @return {void}
+         */
+        function updateBottomSelector() {
+            bottomSelector.val($(this).val());
+        }
+        topSelector.on('change', updateBottomSelector);
+
+        /**
+         * Triggers the primary submit when then secondary submit is clicked.
+         *
+         * @since 5.7.0
+         *
+         * @return {void}
+         */
+        function triggerSubmitClick(e) {
+            e.preventDefault();
+            e.stopPropagation();
+
+            topSubmit.trigger('click');
+        }
+        bottomSubmit.on('click', triggerSubmitClick);
+    }
+
+    // Marry the secondary "Bulk actions" controls to the primary controls:
+    marryControls( $('#bulk-action-selector-top'), $('#doaction'), $('#bulk-action-selector-bottom'), $('#doaction2') );
+
+    // Marry the secondary "Change role to" controls to the primary controls:
+    marryControls( $('#new_role'), $('#changeit'), $('#new_role2'), $('#changeit2') );
+
+    /**
      * Shows row actions on focus of its parent container element or any other elements contained within.
      *
@@ -1322 +1378 @@
             /*
              * action = bulk action dropdown at the top of the table
-             * action2 = bulk action dropdow at the bottom of the table
              */
-            if ( $('select[name="action"]').val() == -1 && $('select[name="action2"]').val() == -1 && pageInput.val() == currentPage )
+            if ( $('select[name="action"]').val() == -1 && pageInput.val() == currentPage )
                 pageInput.val('1');
         });

trunk/src/js/_enqueues/admin/edit-comments.js

@@ -809 +809 @@
         });
 
-        $('#doaction, #doaction2, #post-query-submit').click(function(){
+        $('#doaction, #post-query-submit').click(function(){
             if ( $('#the-comment-list #replyrow').length > 0 )
                 commentReply.close();

trunk/src/js/_enqueues/admin/inline-edit-post.js

@@ -140 +140 @@
          * Adds onclick events to the apply buttons.
          */
-        $('#doaction, #doaction2').click(function(e){
+        $('#doaction').click(function(e){
             var n;
 

trunk/src/js/_enqueues/admin/media.js

@@ -179 +179 @@
 
         // Binds the bulk action events to the submit buttons.
-        $( '#doaction, #doaction2' ).click( function( event ) {
+        $( '#doaction' ).click( function( event ) {
 
             /*
-             * Retrieves all select elements for bulk actions that have a name starting with `action`
-             * and handle its action based on its value.
+             * Handle the bulk action based on its value.
              */
-            $( 'select[name^="action"]' ).each( function() {
+            $( 'select[name="action"]' ).each( function() {
                 var optionValue = $( this ).val();
 

trunk/src/wp-admin/css/forms.css

@@ -493 +493 @@
 }
 
+/* @since 5.7.0 secondary bulk action controls require JS. */
+.no-js label[for="bulk-action-selector-bottom"],
+.no-js select#bulk-action-selector-bottom,
+.no-js input#doaction2,
+.no-js label[for="new_role2"],
+.no-js select#new_role2,
+.no-js input#changeit2 {
+    display: none;
+}
+
 .tablenav .actions select {
     float: left;

trunk/src/wp-admin/edit-comments.php

@@ -32 +32 @@
     } elseif ( isset( $_REQUEST['delete_comments'] ) ) {
         $comment_ids = $_REQUEST['delete_comments'];
-        $doaction    = ( '-1' !== $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
+        $doaction    = $_REQUEST['action'];
     } elseif ( isset( $_REQUEST['ids'] ) ) {
         $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -525 +525 @@
         if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
             return $_REQUEST['action'];
-        }
-
-        if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
-            return $_REQUEST['action2'];
         }
 

trunk/src/wp-admin/includes/class-wp-terms-list-table.php

@@ -172 +172 @@
      */
     public function current_action() {
-        if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) ) {
+        if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && 'delete' === $_REQUEST['action'] ) {
             return 'bulk-delete';
         }

trunk/src/wp-admin/includes/class-wp-users-list-table.php

@@ -336 +336 @@
      */
     public function current_action() {
-        if ( ( isset( $_REQUEST['changeit'] ) || isset( $_REQUEST['changeit2'] ) ) &&
-            ( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
+        if ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) {
             return 'promote';
         }

trunk/src/wp-admin/network/site-users.php

@@ -141 +141 @@
             check_admin_referer( 'bulk-users' );
             $editable_roles = get_editable_roles();
-            $role           = false;
-            if ( ! empty( $_REQUEST['new_role2'] ) ) {
-                $role = $_REQUEST['new_role2'];
-            } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
-                $role = $_REQUEST['new_role'];
-            }
+            $role           = $_REQUEST['new_role'];
 
             if ( empty( $editable_roles[ $role ] ) ) {

trunk/src/wp-admin/network/sites.php

@@ -178 +178 @@
 
         case 'allblogs':
-            if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allblogs'] ) ) {
-                $doaction = -1 != $_POST['action'] ? $_POST['action'] : $_POST['action2'];
+            if ( isset( $_POST['action'] ) && isset( $_POST['allblogs'] ) ) {
+                $doaction = $_POST['action'];
 
                 foreach ( (array) $_POST['allblogs'] as $key => $val ) {

trunk/src/wp-admin/network/users.php

@@ -47 +47 @@
             }
 
-            if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
+            if ( isset( $_POST['action'] ) && isset( $_POST['allusers'] ) ) {
                 check_admin_referer( 'bulk-users-network' );
 
-                $doaction     = -1 != $_POST['action'] ? $_POST['action'] : $_POST['action2'];
+                $doaction     = $_POST['action'];
                 $userfunction = '';
 

trunk/src/wp-admin/users.php

@@ -113 +113 @@
 
         $editable_roles = get_editable_roles();
-        $role           = false;
-        if ( ! empty( $_REQUEST['new_role2'] ) ) {
-            $role = $_REQUEST['new_role2'];
-        } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
-            $role = $_REQUEST['new_role'];
-        }
+        $role           = $_REQUEST['new_role'];
 
         if ( ! $role || empty( $editable_roles[ $role ] ) ) {