From 0b685d8983a6ea10db68b48b063808f1fd782171 Mon Sep 17 00:00:00 2001
From: "M. Rehan" <muhammadrehan@Muhammads-MacBook-Pro-2.local>
Date: Sun, 10 Jan 2016 21:32:37 +0500
Subject: [PATCH] fix for course number display string as none

---
 .../views/tests/test_course_index.py          | 21 +++++++++++++++++++
 cms/templates/base.html                       |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py
index b9004217cb..c043f90da8 100644
--- a/cms/djangoapps/contentstore/views/tests/test_course_index.py
+++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py
@@ -289,6 +289,27 @@ class TestCourseIndex(CourseTestCase):
         response = self.client.get_html(course_outline_url_split)
         self.assertEqual(response.status_code, 404)
 
+    def test_course_outline_with_display_course_number_as_none(self):
+        """
+        Tests course outline when 'display_coursenumber' field is none.
+        """
+        # Change 'display_coursenumber' field to None and update the course.
+        self.course.display_coursenumber = None
+        updated_course = self.update_course(self.course, self.user.id)
+
+        # Assert that 'display_coursenumber' field has been changed successfully.
+        self.assertEqual(updated_course.display_coursenumber, None)
+
+        # Perform GET request on course outline url with the course id.
+        course_outline_url = reverse_course_url('course_handler', updated_course.id)
+        response = self.client.get_html(course_outline_url)
+
+        # Assert that response code is 200.
+        self.assertEqual(response.status_code, 200)
+
+        # Assert that 'display_course_number' is being set to "" (as display_coursenumber was None).
+        self.assertIn('display_course_number: ""', response.content)
+
 
 @ddt.ddt
 class TestCourseOutline(CourseTestCase):
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 5d46a3c549..9bacefda13 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -85,7 +85,7 @@ from openedx.core.lib.js_utils import (
                       url_name: "${context_course.location.name | h}",
                       org: "${context_course.location.org | h}",
                       num: "${context_course.location.course | h}",
-                      display_course_number: "${_(context_course.display_coursenumber)}",
+                      display_course_number: "${_(context_course.display_coursenumber) if context_course.display_coursenumber else ''}",
                       revision: "${context_course.location.revision | h}",
                       self_paced: ${escape_json_dumps(context_course.self_paced) | n}
                   });