Changeset 13507

Timestamp:

04/12/2024 03:58:20 AM (13 months ago)

Author:

dd32

Message:

Plugin Directory: Allow reviewers to move a plugin from pending (Pending developer feedback) back to new (Pending initial review), and from rejected back to pending (Pending developer feedback)

Fixes #7386.

Location:

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

Files:

• class-status-transitions.php (modified) (6 diffs)
• metabox/class-controls.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php

@@ -36 +36 @@
 
     /**
-     * Get the list of allowed status transitions for a given plugin.
-     *
-     * @param string $post_status Plugin post status.
+     * Get the list of allowed status transitions for a given plugin status & post.
+     *
+     * @param string   $post_status Plugin post status.
+     * @param \WP_Post $post        Plugin post object.
      *
      * @return array An array of allowed post status transitions.
      */
-    public static function get_allowed_transitions( $post_status ) {
+    public static function get_allowed_transitions( $post_status, $post ) {
+        // NOTE: $post_status and $post->post_status will differ, as it's used during a pre-update hook.
         switch ( $post_status ) {
             case 'new':
@@ -48 +50 @@
                 break;
             case 'pending':
-                $transitions = array( 'approved', 'rejected' );
+                $transitions = array( 'approved', 'rejected', 'new' );
                 break;
             case 'approved':
@@ -55 +57 @@
                 break;
             case 'rejected':
-                // Rejections cannot be recovered.
                 $transitions = array();
+                // If it was rejected less than a week ago, allow it to be recovered.
+                $rejected_date = get_post_meta( $post->ID, '_rejected', true );
+                if ( $rejected_date >= strtotime( '-1 week' ) ) {
+                    $transitions[] = 'pending';
+                }
                 break;
             case 'publish':
@@ -97 +103 @@
 
         // ...or it's a plugin admin...
-        if ( current_user_can( 'plugin_approve', $postarr['ID'] ) && in_array( $postarr['post_status'], self::get_allowed_transitions( $old_status ) ) ) {
+        if ( current_user_can( 'plugin_approve', $postarr['ID'] ) && in_array( $postarr['post_status'], self::get_allowed_transitions( $old_status, get_post( $postarr['ID'] ) ) ) ) {
             return $data;
         }
@@ -158 +164 @@
                 $this->set_translation_status( $post, 'inactive' );
                 break;
+
+            case 'pending':
+                if ( 'rejected' === $old_status ) {
+                    $this->restore_rejected_plugin( $post );
+                }
+
+            case 'new':
+                // If it's moved from Pending to new, unasign.
+                if ( 'pending' === $old_status ) {
+                    $this->clear_reviewer( $post );
+                }
         }
 
@@ -298 +315 @@
 
     /**
+     * Restores a rejected plugin.
+     *
+     * @param \WP_Post $post Post object.
+     */
+    public function restore_rejected_plugin( $post ) {
+        $slug = $post->post_name;
+        $slug = preg_replace( '!^rejected-(.+)-rejected$!i', '$1', $slug );
+
+        // Change slug back to 'plugin-name'.
+        wp_update_post( array(
+            'ID'        => $post->ID,
+            'post_name' => $slug,
+        ) );
+
+        delete_post_meta( $post_id, '_rejection_reason' );
+        delete_post_meta( $post_id, 'plugin_rejected_date' );
+    }
+
+    /**
      * Returns the path to a plugins root directory.
      *

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-controls.php

@@ -66 +66 @@
                 $label = __( 'Close', 'wporg-plugins' );
                 break;
+            case 'new':
+                $label = __( 'Mark as Pending Initial Review', 'wporg-plugins' );
+                break;
             case 'pending':
             default:
@@ -89 +92 @@
 
         if ( current_user_can( 'plugin_approve', $post ) ) {
-            $statuses = Status_Transitions::get_allowed_transitions( $post->post_status );
+            $statuses = Status_Transitions::get_allowed_transitions( $post->post_status, $post );
         }
 
@@ -141 +144 @@
                 if ( 'pending' === $status && ! $post->assigned_reviewer ) {
                     printf(
-                        '<p class="pending-assign"><button onclick="%s" type="submit" name="post_status" value="%s" class="button set-plugin-status button-primary">%s</button></p>',
-                        esc_attr( "document.getElementById('assigned_reviewer').value = userSettings.uid" ),
+                        '<p class="pending-assign"><button type="submit" name="post_status" value="%s" class="button set-plugin-status pending-and-assign button-primary">%s</button></p>',
                         esc_attr( $status ),
                         esc_attr__( 'Mark as Pending & Assign Review', 'wporg-plugins' ),