Changeset 4526

Timestamp:

12/13/2016 10:39:28 PM (10 years ago)

Author:

coreymckrill

Message:

Mentor Dashboard improvements

• Ensure we have a name string for each mentor
• Sort un-mentored camps by start date

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/mentors/dashboard.php (modified) (4 diffs)

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

@@ -149 +149 @@
                 'posts_per_page' => 10000,
                 'order'          => 'ASC',
-                'orderby'        => 'name',
+                'orderby'        => 'meta_value',
+                'meta_key'       => 'Start Date (YYYY-mm-dd)',
                 'meta_query'     => array(
                         'relation' => 'OR',
@@ -166 +167 @@
         foreach ( $posts as $post ) {
                 $email = get_post_meta( $post->ID, 'Mentor E-mail Address', true );
-                $camp_name = $post->post_title;
+                $camp_name = $post->post_title . ' (' . wcpt_get_wordcamp_start_date( $post->ID ) . ')';
 
                 if ( $email ) {
@@ -317 +318 @@
 
                 if ( $user instanceof \WP_User ) {
+                        // Make sure we get a name
+                        if ( $user->display_name ) {
+                                $name = $user->display_name;
+                        } else if ( $user->nickname ) {
+                                $name = $user->nickname;
+                        } else if ( $user->first_name && $user->last_name ) {
+                                $name = sprintf( '%s %s', $user->first_name, $user->last_name );
+                        } else {
+                                $name = $username;
+                        }
+
                         $data[ $username ] = array(
-                                'name'  => $user->display_name,
+                                'name'  => $name,
                                 'email' => $user->user_email,
                         );
@@ -346 +358 @@
         ksort( $data );
 
-        \set_site_transient( MENTORS_CACHE_KEY, $data, WEEK_IN_SECONDS );
+        \set_site_transient( MENTORS_CACHE_KEY, $data, DAY_IN_SECONDS );
 
         return $data;