Changeset 2893

Timestamp:

04/04/2016 08:50:21 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Post Type: Update required fields logic for new statuses.

File:

• sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php (modified) (7 diffs)

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php

@@ -46 +46 @@
         add_action( 'wcpt_added_to_planning_schedule',                array( $this, 'mark_date_added_to_planning_schedule' ), 10 );
         add_filter( 'wp_insert_post_data',                            array( $this, 'enforce_post_status' ), 10, 2 );
-        add_filter( 'wp_insert_post_data',                            array( $this, 'require_complete_meta_to_publish_wordcamp' ), 10, 2 );
+        add_filter( 'wp_insert_post_data',                            array( $this, 'require_complete_meta_to_publish_wordcamp' ), 11, 2 ); // after enforce_post_status
 
         // Admin notices
@@ -617 +617 @@
      * Trigger actions related to WordCamps being scheduled.
      *
-     * When an application is submitted, a `wordcamp` post is created with a `draft` status. When it's accepted
-     * to the planning schedule the status changes to `pending`, and when it's accepted for the final schedule
-     * the status changes to 'publish'.
-     *
      * @param string $new_status
      * @param string $old_status
@@ -751 +747 @@
         }
 
-        // todo update for new statuses
-
         // The ID of the last site that was created before this rule went into effect, so that we don't apply the rule retroactively.
         $min_site_id = apply_filters( 'wcpt_require_complete_meta_min_site_id', '2416297' );
 
-        $required_pending_fields = $this->get_required_fields( 'pending' );
-        $required_publish_fields = $this->get_required_fields( 'publish' );
+        $required_pre_planning_fields = $this->get_required_fields( 'pre-planning' );
+        $required_scheduled_fields    = $this->get_required_fields( 'scheduled' );
 
         // Check pending posts
-        if ( 'pending' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
-            foreach( $required_pending_fields as $field ) {
+        if ( 'wcpt-approved-pre-pl' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
+            foreach( $required_pre_planning_fields as $field ) {
                 $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
 
                 if ( empty( $value ) || 'null' == $value ) {
-                    $post_data['post_status']     = 'draft';
+                    $post_data['post_status']     = 'wcpt-interview-sched';
+                    $this->active_admin_notices[] = 1;
+                    break;
+                }
+            }
+        }
+
+        // Check published posts
+        if ( 'wcpt-scheduled' == $post_data['post_status'] && isset( $_POST['post_ID'] ) && absint( $_POST['post_ID'] ) > $min_site_id ) {
+            foreach( $required_scheduled_fields as $field ) {
+                $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
+
+                if ( empty( $value ) || 'null' == $value ) {
+                    $post_data['post_status']     = 'wcpt-needs-schedule';
                     $this->active_admin_notices[] = 3;
                     break;
@@ -772 +779 @@
         }
 
-        // Check published posts
-        if ( 'publish' == $post_data['post_status'] && isset( $_POST['post_ID'] ) && absint( $_POST['post_ID'] ) > $min_site_id ) {
-            foreach( $required_publish_fields as $field ) {
-                $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
-
-                if ( empty( $value ) || 'null' == $value ) {
-                    $post_data['post_status']     = 'pending';
-                    $this->active_admin_notices[] = 1;
-                    break;
-                }
-            }
-        }
-
         return $post_data;
     }
@@ -791 +785 @@
      * Get a list of fields required to move to a certain post status
      *
-     * @param string $status 'pending' | 'publish' | 'any'
+     * @param string $status 'pre-planning' | 'scheduled' | 'any'
      *
      * @return array
      */
     public static function get_required_fields( $status ) {
-        $pending = array( 'E-mail Address' );
-
-        $publish = array(
+        $pre_planning = array( 'E-mail Address' );
+
+        $scheduled = array(
             // WordCamp
             'Start Date (YYYY-mm-dd)',
@@ -820 +814 @@
 
         switch ( $status ) {
-            case 'pending':
-                $required_fields = $pending;
+            case 'pre-planning':
+                $required_fields = $pre_planning;
                 break;
 
-            case 'publish':
-                $required_fields = $publish;
+            case 'scheduled':
+                $required_fields = $scheduled;
                 break;
 
             case 'any':
             default:
-                $required_fields = array_merge( $pending, $publish );
+                $required_fields = array_merge( $pre_planning, $scheduled );
                 break;
         }
@@ -877 +871 @@
         }
 
-        // todo update for new statuses
-
         $notices = array(
             1 => array(
                 'type'   => 'error',
-                'notice' => __( 'This WordCamp cannot be published until all of its required metadata is filled in.', 'wordcamporg' ),
+                'notice' => __( 'This WordCamp cannot be approved for pre-planning until all of its required metadata is filled in.', 'wordcamporg' ),
             ),
 
             3 => array(
                 'type'   => 'error',
-                'notice' => __( 'This WordCamp cannot be set to pending until all of its required metadata is filled in.', 'wordcamporg' ),
+                'notice' => __( 'This WordCamp cannot be added to the schedule until all of its required metadata is filled in.', 'wordcamporg' ),
             ),
         );