Consistently use display_name_with_default in Studio

[bradenmacdonald]

A one-line fix for Studio + acceptance test.

Description: If an XBlock has no display_name set but instead implements display_name_with_default, Studio sometimes uses the latter and sometimes just uses the block type instead. This is a one-line fix to address that inconsistency.

Discussions: Discussed with Cale and Ned at open-craft/xblock-mentoring#4 (comment)

Sandbox: Active at http://sandbox.opencraft.com:18010/ though if it's working it should be indistinguishable from normal.

Partner information: hosted on edx.org (Harvard)

Merge timeline: TBD... but hoping this can get in quickly as it is a fix used by the mentoring v2 block that is almost finished its review.

Notes: Not sure if we want a full bok choy test for this, but I wrote one and am including it for now. The test does fail without this fix.

[openedx-webhooks]

Thanks for the pull request, @bradenmacdonald! I've created OSPR-472 to keep track of it in JIRA. JIRA is a place for product owners to prioritize feature reviews by the engineering development teams.

Feel free to add as much of the following information to the ticket:

• supporting documentation
• edx-code email threads
• timeline information ('this must be merged by XX date', and why that is)
• partner information ('this is a course on edx.org')
• any other information that can help Product understand the context for the PR

All technical communication about the code itself will still be done via the Github pull request interface. As a reminder, our process documentation is here.

[sarina]

👍 from me.

@cpennington or @nedbat - would one of you be able to quickly review this?

[cpennington]

👍

[sarina]

One question before I Merge - if a block implements display_name but NOT display_name_with_default, what will happen? I just want to make sure this change isn't going to inadvertently break anything.

[bradenmacdonald]

@sarina There is a default implementation of display_name_with_default mixed into all blocks, and it will use display_name if available.

[sarina]

@bradenmacdonald ah awesome - thanks for the clarification.