Clean up display_name hack - fix to Studio submitted upstream

mentoring/answer.py

@@ -144,17 +144,11 @@ class AnswerBlock(AnswerMixin, StepMixin, StudioEditableXBlockMixin, XBlock):
     editable_fields = ('question', 'name', 'min_characters', 'weight', 'default_from')
 
     @property
-    def studio_display_name(self):
+    def display_name_with_default(self):
         if not self.lonely_step:
             return self._(u"Question {number}").format(number=self.step_number)
         return self._(u"Question")
 
-    def __getattribute__(self, name):
-        """ Provide a read-only display name without adding a display_name field to the class. """
-        if name == "display_name":
-            return self.studio_display_name
-        return super(AnswerBlock, self).__getattribute__(name)
-
     @lazy
     def student_input(self):
         """

mentoring/choice.py

@@ -61,19 +61,13 @@ class ChoiceBlock(StudioEditableXBlockMixin, XBlock):
         return self.runtime.service(self, "i18n").ugettext(text)
 
     @property
-    def studio_display_name(self):
+    def display_name_with_default(self):
         try:
             status = self.get_parent().describe_choice_correctness(self.value)
         except Exception:
             status = self._(u"Out of Context")  # Parent block should implement describe_choice_correctness()
         return self._(u"Choice ({status})").format(status=status)
 
-    def __getattribute__(self, name):
-        """ Provide a read-only display name without adding a display_name field to the class. """
-        if name == "display_name":
-            return self.studio_display_name
-        return super(ChoiceBlock, self).__getattribute__(name)
-
     def fallback_view(self, view_name, context):
         return Fragment(u'<span class="choice-text">{}</span>'.format(self.content))
 

mentoring/message.py

@@ -69,7 +69,7 @@ class MentoringMessageBlock(XBlock, StudioEditableXBlockMixin):
         return Fragment(html)
 
     @property
-    def studio_display_name(self):
+    def display_name_with_default(self):
         if self.type == 'max_attempts_reached':
             max_attempts = self.get_parent().max_attempts
             return self._(u"Message when student reaches max. # of attempts ({limit})").format(
@@ -81,12 +81,6 @@ class MentoringMessageBlock(XBlock, StudioEditableXBlockMixin):
             return self._(u"Message shown when incomplete")
         return u"INVALID MESSAGE"
 
-    def __getattribute__(self, name):
-        """ Provide a read-only display name without adding a display_name field to the class. """
-        if name == "display_name":
-            return self.studio_display_name
-        return super(MentoringMessageBlock, self).__getattribute__(name)
-
     @classmethod
     def get_template(cls, template_id):
         """

mentoring/questionnaire.py

@@ -114,17 +114,11 @@ class QuestionnaireAbstractBlock(StudioEditableXBlockMixin, StudioContainerXBloc
         return block
 
     @property
-    def studio_display_name(self):
+    def display_name_with_default(self):
         if not self.lonely_step:
             return self._(u"Question {number}").format(number=self.step_number)
         return self._(u"Question")
 
-    def __getattribute__(self, name):
-        """ Provide a read-only display name without adding a display_name field to the class. """
-        if name == "display_name":
-            return self.studio_display_name
-        return super(QuestionnaireAbstractBlock, self).__getattribute__(name)
-
     def student_view(self, context=None):
         name = getattr(self, "unmixed_class", self.__class__).__name__
 

mentoring/templates/html/answer_editable.html

 <div class="xblock-answer" data-completed="{{ self.completed }}">
-  {% if not hide_header %}<h3 class="question-title">{{ self.display_name }}</h3>{% endif %}
+  {% if not hide_header %}<h3 class="question-title">{{ self.display_name_with_default }}</h3>{% endif %}
   <p>{{ self.question }}</p>
   <textarea
      class="answer editable" cols="50" rows="10" name="input"

mentoring/templates/html/mcqblock.html

 <fieldset class="choices questionnaire">
   <legend class="question">
-    {% if not hide_header %}<h3 class="question-title">{{ self.display_name }}</h3>{% endif %}
+    {% if not hide_header %}<h3 class="question-title">{{ self.display_name_with_default }}</h3>{% endif %}
     <p>{{ self.question }}</p>
   </legend>
   <div class="choices-list">

mentoring/templates/html/mrqblock.html

 <fieldset class="choices questionnaire" data-hide_results="{{self.hide_results}}">
   <legend class="question">
-	  {% if not hide_header %}<h3 class="question-title">{{ self.display_name }}</h3>{% endif %}
+	  {% if not hide_header %}<h3 class="question-title">{{ self.display_name_with_default }}</h3>{% endif %}
     <p>{{ self.question }}</p>
   </legend>
   <div class="choices-list">

mentoring/templates/html/ratingblock.html

 <fieldset class="rating questionnaire">
   <legend class="question">
-    {% if not hide_header %}<h3 class="question-title">{{ self.display_name }}</h3>{% endif %}
+    {% if not hide_header %}<h3 class="question-title">{{ self.display_name_with_default }}</h3>{% endif %}
     <p>{{ self.question }}</p>
   </legend>
   <div class="choices-list">

mentoring/tip.py

@@ -76,7 +76,7 @@ class TipBlock(StudioEditableXBlockMixin, XBlock):
         return self.runtime.service(self, "i18n").ugettext(text)
 
     @property
-    def studio_display_name(self):
+    def display_name_with_default(self):
         values_list = []
         for entry in self.get_parent().human_readable_choices:
             if entry["value"] in self.values:
@@ -86,12 +86,6 @@ class TipBlock(StudioEditableXBlockMixin, XBlock):
                 values_list.append(display_name)
         return self._(u"Tip for {list_of_choices}").format(list_of_choices=u", ".join(values_list))
 
-    def __getattribute__(self, name):
-        """ Provide a read-only display name without adding a display_name field to the class. """
-        if name == "display_name":
-            return self.studio_display_name
-        return super(TipBlock, self).__getattribute__(name)
-
     def fallback_view(self, view_name, context):
         html = ResourceLoader(__name__).render_template("templates/html/tip.html", {
             'content': self.content,