From 95c67538b99bb2ad05f94b49617bdfea02c8d0fd Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 26 Oct 2009 19:39:46 -0400 Subject: [PATCH] use the right display name for users --- classes/WDTSDisplayFilters.inc | 2 +- classes/WhatDidTheySayAdmin.inc | 4 ++-- classes/partials/meta-box.inc | 2 +- .../TestMetaboxApprovedTranscriptEditing.html | 22 ++++++++++++++++++- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/classes/WDTSDisplayFilters.inc b/classes/WDTSDisplayFilters.inc index f04ad59..60fb18e 100644 --- a/classes/WDTSDisplayFilters.inc +++ b/classes/WDTSDisplayFilters.inc @@ -24,7 +24,7 @@ class WDTSDisplayFilters { } function the_approved_credit($user, $content = '') { - return '
' . sprintf(__('Written by %1$s %2$s', 'what-did-they-say'), get_avatar($user->ID, 20), $user->user_nicename) . '
'; + return '
' . sprintf(__('Written by %1$s %2$s', 'what-did-they-say'), get_avatar($user->ID, 20), $user->display_name) . '
'; } function _process_transcript_content($transcript) { diff --git a/classes/WhatDidTheySayAdmin.inc b/classes/WhatDidTheySayAdmin.inc index f8b37e4..bd8f29f 100644 --- a/classes/WhatDidTheySayAdmin.inc +++ b/classes/WhatDidTheySayAdmin.inc @@ -1076,7 +1076,7 @@ class WhatDidTheySayAdmin { $available_filters = $this->_get_available_override_filters(); $suggested_amount = 20 + ($this->transcript_count * 0.1); - $users = $wpdb->get_results("SELECT ID, user_login from $wpdb->users ORDER BY user_login"); + $users = $wpdb->get_results("SELECT ID, user_login, display_name from $wpdb->users ORDER BY user_login"); include('partials/admin.inc'); } @@ -1101,7 +1101,7 @@ class WhatDidTheySayAdmin { $language_options = new WDTSLanguageOptions(); - $users = $wpdb->get_results("SELECT ID, user_login from $wpdb->users ORDER BY user_login"); + $users = $wpdb->get_results("SELECT ID, user_login, display_name from $wpdb->users ORDER BY user_login"); $nonce = wp_create_nonce('what-did-they-say'); include('partials/meta-box.inc'); diff --git a/classes/partials/meta-box.inc b/classes/partials/meta-box.inc index 1907055..efa469b 100644 --- a/classes/partials/meta-box.inc +++ b/classes/partials/meta-box.inc @@ -54,7 +54,7 @@ - + TestMetaboxApprovedTranscriptEditing @@ -31,6 +31,11 @@ //textarea[@name="wdts[transcripts][en][transcript]"] This is a test transcript. + + select + //select[@name="wdts[transcripts][en][user_id]"] + index=1 + select //select[@name="wdts[language]"] @@ -51,6 +56,11 @@ //textarea[@name="wdts[transcripts][de][transcript]"] Dies ist ein Test transcript. + + select + //select[@name="wdts[transcripts][de][user_id]"] + index=2 + clickAndWait publish @@ -71,6 +81,16 @@ //textarea[@name="wdts[transcripts][de][transcript]"] Dies ist ein Test transcript. + + assertSelectedIndex + //select[@name="wdts[transcripts][en][user_id]"] + 1 + + + assertSelectedIndex + //select[@name="wdts[transcripts][de][user_id]"] + 2 +