codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

/courses?_ppc=blah logged out message

Browse source 
Also trim /courses prepaid code input.
This commit is contained in:
Matt Lott 2015-10-07 14:56:10 -07:00
parent 7390f2d1e4
commit 440bf9c6e0
2 changed files with 8 additions and 2 deletions
app
templates/courses
courses.jade
views/courses
CoursesView.coffee

2
app/templates/courses/courses.jade
View file

@ -9,6 +9,8 @@ block content
br br
if state === 'enrolling' if state === 'enrolling'
.alert.alert-info Enrolling in course.. .alert.alert-info Enrolling in course..
else if state === 'ppc_logged_out'
.alert.alert-success Log in or create an account to join this course.
else else
if state === 'unknown_error' if state === 'unknown_error'
.alert.alert-danger.alert-dismissible= stateMessage .alert.alert-danger.alert-dismissible= stateMessage

8
app/views/courses/CoursesView.coffee
View file

@ -26,7 +26,11 @@ module.exports = class CoursesView extends RootView
@courseInstances = new CocoCollection([], { url: "/db/user/#{me.id}/course_instances", model: CourseInstance}) @courseInstances = new CocoCollection([], { url: "/db/user/#{me.id}/course_instances", model: CourseInstance})
@listenToOnce @courseInstances, 'sync', @onCourseInstancesLoaded @listenToOnce @courseInstances, 'sync', @onCourseInstancesLoaded
@supermodel.loadCollection(@courseInstances, 'course_instances') @supermodel.loadCollection(@courseInstances, 'course_instances')
@courseEnroll(prepaidCode) if prepaidCode = utils.getQueryVariable('_ppc', false) if prepaidCode = utils.getQueryVariable('_ppc', false)
if me.isAnonymous()
@state = 'ppc_logged_out'
else
@courseEnroll(prepaidCode)
getRenderData: -> getRenderData: ->
context = super() context = super()
@ -75,7 +79,7 @@ module.exports = class CoursesView extends RootView
onClickEnroll: (e) -> onClickEnroll: (e) ->
$('.continue-dialog').modal('hide') $('.continue-dialog').modal('hide')
courseID = $(e.target).data('course-id') courseID = $(e.target).data('course-id')
prepaidCode = $(".code-input[data-course-id=#{courseID}]").val() prepaidCode = ($(".code-input[data-course-id=#{courseID}]").val() ? '').trim()
@courseEnroll(prepaidCode) @courseEnroll(prepaidCode)
onClickEnter: (e) -> onClickEnter: (e) ->