Ticket #38112: 38112.2.diff

src/wp-admin/includes/update.php

@@ -690 +690 @@
                         <# } #>
                 </div>
         </script>
+        <script id="tmpl-wp-bulk-deletions-admin-notice" type="text/html">
+                <div id="{{ data.id }}" class="{{ data.className }} notice <# if ( data.errors ) { #>notice-error<# } else { #>notice-success<# } #>">
+                        <p>
+                                <# if ( data.successes ) { #>
+                                        <# if ( 1 === data.successes ) { #>
+                                                <# if ( 'plugin' === data.type ) { #>
+                                                        <?php
+                                                        /* translators: %s: Number of plugins */
+                                                        printf( __( '%s plugin successfully deleted.' ), '{{ data.successes }}' );
+                                                        ?>
+                                                <# } else { #>
+                                                        <?php
+                                                        /* translators: %s: Number of themes */
+                                                        printf( __( '%s theme successfully deleted.' ), '{{ data.successes }}' );
+                                                        ?>
+                                                <# } #>
+                                        <# } else { #>
+                                                <# if ( 'plugin' === data.type ) { #>
+                                                        <?php
+                                                        /* translators: %s: Number of plugins */
+                                                        printf( __( '%s plugins successfully deleted.' ), '{{ data.successes }}' );
+                                                        ?>
+                                                <# } else { #>
+                                                        <?php
+                                                        /* translators: %s: Number of themes */
+                                                        printf( __( '%s themes successfully deleted.' ), '{{ data.successes }}' );
+                                                        ?>
+                                                <# } #>
+                                        <# } #>
+                                <# } #>
+                                <# if ( data.errors ) { #>
+                                        <button class="button-link bulk-action-errors-collapsed" aria-expanded="false">
+                                                <# if ( 1 === data.errors ) { #>
+                                                        <?php
+                                                        /* translators: %s: Number of failed updates */
+                                                        printf( __( '%s deletion failed.' ), '{{ data.errors }}' );
+                                                        ?>
+                                                <# } else { #>
+                                                        <?php
+                                                        /* translators: %s: Number of failed updates */
+                                                        printf( __( '%s deletions failed.' ), '{{ data.errors }}' );
+                                                        ?>
+                                                <# } #>
+                                                <span class="screen-reader-text"><?php _e( 'Show more details' ); ?></span>
+                                                <span class="toggle-indicator" aria-hidden="true"></span>
+                                        </button>
+                                <# } #>
+                        </p>
+                        <# if ( data.errors ) { #>
+                                <ul class="bulk-action-errors hidden">
+                                        <# _.each( data.errorMessages, function( errorMessage ) { #>
+                                                <li>{{ errorMessage }}</li>
+                                        <# } ); #>
+                                </ul>
+                        <# } #>
+                </div>
+        </script>
         <?php
 }
 

src/wp-admin/js/updates.js

@@ -848 +848 @@
                         } );
 
                 if ( response.plugin ) {
-                        $plugin          = $( 'tr.inactive[data-plugin="' + response.plugin + '"]' );
+                        $plugin          = $( 'tr[data-plugin="' + response.plugin + '"]' );
                         $pluginUpdateRow = $plugin.siblings( '[data-plugin="' + response.plugin + '"]' );
                 } else {
-                        $plugin          = $( 'tr.inactive[data-slug="' + response.slug + '"]' );
+                        $plugin          = $( 'tr[data-slug="' + response.slug + '"]' );
                         $pluginUpdateRow = $plugin.siblings( '[data-slug="' + response.slug + '"]' );
                 }
 
@@ -2052 +2052 @@
                         } );
 
                         // Display bulk notification for updates of any kind.
-                        $document.on( 'wp-plugin-update-success wp-plugin-update-error wp-theme-update-success wp-theme-update-error', function( event, response ) {
+                        $document.on( 'wp-plugin-update-success wp-plugin-update-error wp-plugin-delete-error wp-theme-update-success wp-theme-update-error wp-theme-delete-error', function( event, response ) {
                                 var $itemRow = $( '[data-slug="' + response.slug + '"]' ),
                                         $bulkActionNotice, itemName;
 
@@ -2067 +2067 @@
 
                                 $itemRow.find( 'input[name="checked[]"]:checked' ).prop( 'checked', false );
 
-                                wp.updates.adminNotice = wp.template( 'wp-bulk-updates-admin-notice' );
+                                if ( -1 !== event.type.indexOf( '-update-' ) ) {
+                                        wp.updates.adminNotice = wp.template( 'wp-bulk-updates-admin-notice' );
+                                } else {
+                                        wp.updates.adminNotice = wp.template( 'wp-bulk-deletions-admin-notice' );
+                                }
 
                                 wp.updates.addAdminNotice( {
                                         id:            'bulk-action-notice',