Remove the 'title' alias for lms.display_name

cms/djangoapps/contentstore/views.py

@@ -135,7 +135,7 @@ def index(request):
 
     return render_to_response('index.html', {
         'new_course_template': Location('i4x', 'edx', 'templates', 'course', 'Empty'),
-        'courses': [(course.title,
+        'courses': [(course.lms.display_name,
                     reverse('course_index', args=[
                         course.location.org,
                         course.location.course,

common/lib/xmodule/xmodule/course_module.py

@@ -742,10 +742,6 @@ class CourseDescriptor(SequenceDescriptor):
         return exams[0] if len(exams) == 1 else None
 
     @property
-    def title(self):
-        return self.display_name
-
-    @property
     def number(self):
         return self.location.course
 

lms/djangoapps/course_wiki/views.py

@@ -95,7 +95,7 @@ def course_wiki_redirect(request, course_id):
             root,
             course_slug,
             title=course_slug,
-            content="This is the wiki for **{0}**'s _{1}_.".format(course.org, course.title),
+            content="This is the wiki for **{0}**'s _{1}_.".format(course.org, course.lms.display_name),
             user_message="Course page automatically created.",
             user=None,
             ip_address=None,

lms/djangoapps/courseware/views.py

@@ -282,7 +282,7 @@ def index(request, course_id, chapter=None, section=None,
         context = {
             'csrf': csrf(request)['csrf_token'],
             'accordion': render_accordion(request, course, chapter, section, model_data_cache),
-            'COURSE_TITLE': course.title,
+            'COURSE_TITLE': course.lms.display_name,
             'course': course,
             'init': '',
             'content': '',

lms/templates/dashboard.html

@@ -199,7 +199,7 @@
           %>
 
 
-          
+
           <a href="${course_target}" class="cover">
             <img src="${course_image_url(course)}" />
           </a>
@@ -216,7 +216,7 @@
               % endif
               </p>
               <h2 class="university">${get_course_about_section(course, 'university')}</h2>
-              <h3><a href="${course_target}">${course.number} ${course.title}</a></h3>
+              <h3><a href="${course_target}">${course.number} ${course.lms.display_name}</a></h3>
             </hgroup>
 
             <%
@@ -226,7 +226,7 @@
             %>
             % if testcenter_exam_info is not None:
 
-                % if registration is None and testcenter_exam_info.is_registering():	    
+                % if registration is None and testcenter_exam_info.is_registering():
                 <div class="message message-status is-shown exam-register">
                   <a href="${testcenter_register_target}" class="button exam-button" id="exam_register_button">Register for Pearson exam</a>
                   <p class="message-copy">Registration for the Pearson exam is now open and will close on <strong>${testcenter_exam_info.registration_end_date_text}</strong></p>
@@ -234,25 +234,25 @@
                 % endif
                 <!-- display a registration for a current exam, even if the registration period is over -->
                 % if registration is not None:
-                    % if registration.is_accepted:  
+                    % if registration.is_accepted:
                 <div class="message message-status is-shown exam-schedule">
                    <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
                    <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>${registration.client_candidate_id}</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
                     % endif
-                    % if  registration.is_rejected:	    
+                    % if  registration.is_rejected:
                 <div class="message message-status is-shown exam-schedule">
                   <p class="message-copy"><strong>Your registration for the Pearson exam has been rejected. Please <a href="${testcenter_register_target}" id="exam_register_link">see your registration status details</a></strong>. Otherwise <a class="contact-link" href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}">contact edX at exam-help@edx.org</a> for further help.</p>
                 </div>
                     % endif
-                   	% if not registration.is_accepted and not registration.is_rejected:	    
+                   	% if not registration.is_accepted and not registration.is_rejected:
 	            <div class="message message-status is-shown">
     	              <p class="message-copy"><strong>Your <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a> is pending</strong>. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
                 </div>
                     % endif
                 % endif
-            % endif   
+            % endif
 
             <%
             cert_status = cert_statuses.get(course.id)
@@ -314,13 +314,13 @@
                 <a href="${course_target}" class="enter-course archived">View Archived Course</a>
               % else:
                 <a href="${course_target}" class="enter-course">View Course</a>
-              % endif              
+              % endif
             % endif
             <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unregister</a>
           </section>
         </article>
 
-        
+
 
       % endfor
     % else:

lms/templates/discussion/index.html

@@ -26,7 +26,7 @@
         <div class="sidebar"></div>
         <div class="discussion-column">
         	<div class="discussion-article blank-slate">
-	        	<h1>${course.title} Discussion</h1>
+	        	<h1>${course.lms.display_name} Discussion</h1>
 
         	</div>
         </div>

lms/templates/navigation.html

@@ -41,7 +41,7 @@ site_status_msg = get_site_status_msg(course_id)
   <h1 class="logo"><a href="${reverse('root')}"><img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}"/></a></h1>
 
     % if course:
-      <h2><span class="provider">${course.org}:</span> ${course.number} ${course.title}</h2>
+      <h2><span class="provider">${course.org}:</span> ${course.number} ${course.lms.display_name}</h2>
     % endif
 
     <ol class="left find-courses-button">