Changeset 13128

Timestamp:

01/19/2024 04:52:27 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: Include the name of the user being removed as a committer / support rep.

Fixes #5975.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets

Files:

• class-committers.php (modified) (1 diff)
• class-support-reps.php (modified) (1 diff)
• js/committers.js (modified) (1 diff)
• js/support-reps.js (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-committers.php

@@ -36 +36 @@
 
                 if ( current_user_can( 'plugin_add_committer', $post ) || current_user_can( 'plugin_remove_committer', $post ) ) {
-                        wp_enqueue_script( 'wporg-plugins-committers', plugins_url( 'js/committers.js', __FILE__ ), array( 'wp-util' ), true );
+                        wp_enqueue_script( 'wporg-plugins-committers', plugins_url( 'js/committers.js', __FILE__ ), array( 'wp-util' ), filemtime( __DIR__ . '/js/committers.js' ) );
                         wp_localize_script( 'wporg-plugins-committers', 'committersWidget', array(
                                 'restUrl'            => get_rest_url(),
                                 'restNonce'          => wp_create_nonce( 'wp_rest' ),
                                 'pluginSlug'         => $post->post_name,
-                                'removeCommitterAYS' => __( 'Are you sure you want to remove this committer?', 'wporg-plugins' ),
+                                'removeCommitterAYS' => __( 'Are you sure you want to remove %s as a committer?', 'wporg-plugins' ),
                         ) );
                 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-support-reps.php

@@ -37 +37 @@
 
                 if ( current_user_can( 'plugin_add_support_rep', $post ) || current_user_can( 'plugin_remove_support_rep', $post ) ) {
-                        wp_enqueue_script( 'wporg-plugins-support-reps', plugins_url( 'js/support-reps.js', __FILE__ ), array( 'wp-util' ), true );
+                        wp_enqueue_script( 'wporg-plugins-support-reps', plugins_url( 'js/support-reps.js', __FILE__ ), array( 'wp-util' ), filemtime( __DIR__ . '/js/support-reps.js' ) );
                         wp_localize_script( 'wporg-plugins-support-reps', 'supportRepsWidget', array(
                                 'restUrl'             => get_rest_url(),
                                 'restNonce'           => wp_create_nonce( 'wp_rest' ),
                                 'pluginSlug'          => $post->post_name,
-                                'removeSupportRepAYS' => __( 'Are you sure you want to remove this support rep?', 'wporg-plugins' ),
+                                'removeSupportRepAYS' => __( 'Are you sure you want to remove %s as a support rep?', 'wporg-plugins' ),
                         ) );
                 } elseif ( ! $support_reps ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/js/committers.js

@@ -19 +19 @@
                 $( '#committer-list' )
                         .on( 'click', '.remove', function() {
-                                if ( ! window.confirm( pluginDir.removeCommitterAYS ) ) {
+                                var $this = $( this ),
+                                        $row = $this.parents( 'li' ),
+                                        user_id = $row.data( 'user' ),
+                                        url;
+
+                                if (
+                                        ! window.confirm(
+                                                pluginDir.removeCommitterAYS.replace(
+                                                        /%(1[$])?s/,
+                                                        $row.find('a').first().text().trim()
+                                                )
+                                        )
+                                ) {
                                         return;
                                 }
 
-                                var $row = $( this ).addClass( 'spinner' ).parents( 'li' ),
-                                        url = pluginDir.restUrl + 'plugins/v1/plugin/' + pluginDir.pluginSlug + '/committers/' + $row.data( 'user' ) + '/?_wpnonce=' + pluginDir.restNonce;
+                                $this.addClass( 'spinner' );
+
+                                url = pluginDir.restUrl + 'plugins/v1/plugin/' + pluginDir.pluginSlug + '/committers/' + user_id + '/?_wpnonce=' + pluginDir.restNonce;
 
                                 $.post( {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/js/support-reps.js

@@ -19 +19 @@
                 $( '#support-rep-list' )
                         .on( 'click', '.remove', function() {
-                                if ( ! window.confirm( pluginDir.removeSupportRepAYS ) ) {
+                                var $this = $( this ),
+                                        $row = $this.parents( 'li' ),
+                                        user_id = $row.data( 'user' ),
+                                        url;
+
+                                if (
+                                        ! window.confirm(
+                                                pluginDir.removeSupportRepAYS.replace(
+                                                        /%(1[$])?s/,
+                                                        $row.find('a').first().text().trim()
+                                                )
+                                        )
+                                ) {
                                         return;
                                 }
+        
+                                $this.addClass( 'spinner' );
 
-                                var $row = $( this ).addClass( 'spinner' ).parents( 'li' ),
-                                        url = pluginDir.restUrl + 'plugins/v1/plugin/' + pluginDir.pluginSlug + '/support-reps/' + $row.data( 'user' ) + '/?_wpnonce=' + pluginDir.restNonce;
+                                url = pluginDir.restUrl + 'plugins/v1/plugin/' + pluginDir.pluginSlug + '/support-reps/' + user_id + '/?_wpnonce=' + pluginDir.restNonce;
 
                                 $.post( {