Support course slugs that match course names

Must be backwards compatible until we update the course slugs.

Closes #3867
This commit is contained in:
Matt Lott 2016-08-19 15:46:48 -07:00
parent acfe62a786
commit 05159ff7c2
8 changed files with 30 additions and 6 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View file

@ -40,7 +40,7 @@ block content
//- TODO: Automate this list @scott
//- Web dev courses use HTML and JavaScript, except web-dev-1 which doesn't have scripting
- var courseSlug = course.get('slug') || '';
if courseSlug === 'web-dev-1'
if courseSlug === 'web-dev-1' || courseSlug === 'web-development-1'
option(value="javascript")
| HTML
else if courseSlug.indexOf('web-dev') >= 0
@ -97,7 +97,7 @@ mixin course-info(course)
if me.isTeacher() || view.ownedClassrooms.size() || me.isAdmin()
//- Web dev courses use HTML and JavaScript, except web-dev-1 which doesn't have scripting
- var courseSlug = course.get('slug') || '';
if courseSlug === 'web-dev-1'
if courseSlug === 'web-dev-1' || courseSlug === 'web-development-1'
a.guide-btn.btn.btn-primary(href=("/teachers/course-solution/" + course.id + "/javascript") data-course-id=course.id data-course-name=course.get('name') data-event-action="Classes Guides Guide JavaScript" class=(me.isTeacher() || me.isAdmin() ? '': 'disabled'))
span(data-i18n="courses.view_guide_online")
| — HTML

View file

@ -135,6 +135,10 @@ module.exports = class NewHomeView extends RootView
'introduction-to-computer-science': '2-4'
'game-dev-1': '2-3'
'web-dev-1': '2-3'
'game-development-1': '2-3'
'web-development-1': '2-3'
'game-development-2': '2-3'
'web-development-3': '2-3'
'computer-science-6': '24-30'
'computer-science-7': '30-40'
'computer-science-8': '30-40'
@ -144,6 +148,10 @@ module.exports = class NewHomeView extends RootView
'introduction-to-computer-science': '1-3'
'game-dev-1': '1-3'
'web-dev-1': '1-3'
'game-development-1': '1-3'
'web-development-1': '1-3'
'game-development-2': '1-3'
'web-development-2': '1-3'
'computer-science-6': '12-14'
'computer-science-7': '14-16'
'computer-science-8': '14-16'
@ -153,6 +161,10 @@ module.exports = class NewHomeView extends RootView
'introduction-to-computer-science': '1'
'game-dev-1': '1-2'
'web-dev-1': '1-2'
'game-development-1': '1-2'
'web-development-1': '1-2'
'game-development-2': '1-2'
'web-development-2': '1-2'
'computer-science-6': '10-12'
'computer-science-7': '12-16'
'computer-science-8': '12-16'

View file

@ -31,7 +31,7 @@ var courses =
},
{
name: "Game Development 1",
slug: "game-dev-1",
slug: "game-development-1",
campaignID: ObjectId("5789236960deed1f00ec2ab8"),
description: "Learn to create your own games which you can share with your friends.",
duration: NumberInt(1),
@ -40,7 +40,7 @@ var courses =
},
{
name: "Web Development 1",
slug: "web-dev-1",
slug: "web-development-1",
campaignID: ObjectId("578913f2c8871ac2326fa3e4"),
description: "Learn the basics of web development in this introductory HTML & CSS course.",
duration: NumberInt(1),
@ -59,7 +59,7 @@ var courses =
},
{
name: "Game Development 2",
slug: "game-dev-2",
slug: "game-development-2",
campaignID: ObjectId("57b49c866430272000100c4d"),
description: "Learn more advanced game development.",
duration: NumberInt(2),
@ -68,7 +68,7 @@ var courses =
},
{
name: "Web Development 2",
slug: "web-dev-2",
slug: "web-development-2",
campaignID: ObjectId("57891570c8871ac2326fa3f8"),
description: "Learn more advanced web development, including scripting to make interactive webpages.",
duration: NumberInt(2),

View file

@ -22,22 +22,34 @@ CourseSchema.statics.sortCourses = (courses) ->
'introduction-to-computer-science'
'computer-science-2'
'game-dev-1'
'game-development-1'
'web-dev-1'
'web-development-1'
'computer-science-3'
'game-dev-2'
'game-development-2'
'web-dev-2'
'web-development-2'
'computer-science-4'
'game-dev-3'
'game-development-3'
'web-dev-3'
'web-development-3'
'computer-science-5'
'game-dev-4'
'game-development-4'
'web-dev-4'
'web-development-4'
'computer-science-6'
'game-dev-5'
'game-development-5'
'web-dev-5'
'web-development-5'
'computer-science-7'
'game-dev-6'
'game-development-6'
'web-dev-6'
'web-development-6'
'computer-science-8'
]
_.sortBy courses, (course) ->