Changeset 2401 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php

Timestamp:

01/28/2016 06:53:46 PM (11 years ago)

Author:

iandunn

Message:

WordCamp Post Type: Inform users which fields are required.

The required attribute wasn't added to the input fields, since the browser would have to know which status the post is moving towards, and there's already server-side validation for that.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php (modified) (5 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php

@@ -627 +627 @@
                 $min_site_id = apply_filters( 'wcpt_require_complete_meta_min_site_id', '2416297' );
 
-                $required_pending_fields = array( 'E-mail Address' );
-
-                $required_publish_fields = array(
+                $required_pending_fields = $this->get_required_fields( 'pending' );
+                $required_publish_fields = $this->get_required_fields( 'publish' );
+
+                // Check pending posts
+                if ( 'pending' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
+                        foreach( $required_pending_fields as $field ) {
+                                $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
+
+                                if ( empty( $value ) || 'null' == $value ) {
+                                        $post_data['post_status']     = 'draft';
+                                        $this->active_admin_notices[] = 3;
+                                        break;
+                                }
+                        }
+                }
+
+                // 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;
+        }
+
+        /**
+         * Get a list of fields required to move to a certain post status
+         *
+         * @param string $status 'pending' | 'publish' | 'any'
+         *
+         * @return array
+         */
+        public static function get_required_fields( $status ) {
+                $pending = array( 'E-mail Address' );
+
+                $publish = array(
                         // WordCamp
                         'Start Date (YYYY-mm-dd)',
@@ -650 +690 @@
                 );
 
-                // Check pending posts
-                if ( 'pending' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
-                        foreach( $required_pending_fields as $field ) {
-                                $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
-
-                                if ( empty( $value ) || 'null' == $value ) {
-                                        $post_data['post_status']     = 'draft';
-                                        $this->active_admin_notices[] = 3;
-                                        break;
-                                }
-                        }
-                }
-
-                // 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;
+                switch ( $status ) {
+                        case 'pending':
+                                $required_fields = $pending;
+                                break;
+
+                        case 'publish':
+                                $required_fields = $publish;
+                                break;
+
+                        case 'any':
+                        default:
+                                $required_fields = array_merge( $pending, $publish );
+                                break;
+                }
+
+                return $required_fields;
         }
 
@@ -791 +820 @@
         global $post_id;
 
+        $required_fields = WordCamp_Admin::get_required_fields( 'any' );
+
         // @todo When you refactor meta_keys() to support changing labels -- see note in meta_keys() -- also make it support these notes
         $messages = array(
@@ -799 +830 @@
         foreach ( $meta_keys as $key => $value ) :
                 $object_name = wcpt_key_to_str( $key, 'wcpt_' );
-
         ?>
 
@@ -814 +844 @@
                                 <p>
                                         <strong><?php echo $key; ?></strong>
+                                        <?php if ( in_array( $key, $required_fields, true ) ) : ?>
+                                                <span class="description"><?php _e( '(required)', 'wordcamporg' ); ?></span>
+                                        <?php endif; ?>
                                 </p>