diff --git a/app/templates/account/profile.jade b/app/templates/account/profile.jade index c18a85917..cba785d15 100644 --- a/app/templates/account/profile.jade +++ b/app/templates/account/profile.jade @@ -192,7 +192,7 @@ block content span= session.levelName if session.team span.spl - #{session.team} - if session.codeLanguage != 'javascript' + if session.codeLanguage && session.codeLanguage != 'javascript' span.spl - #{{coffeescript: 'CoffeeScript', python: 'Python', lua: 'Lua', io: 'Io', clojure: 'Clojure'}[session.codeLanguage]} if !editing && !sessions.length h3(data-i18n="account_profile.player_code") Player Code diff --git a/app/templates/admin/candidates.jade b/app/templates/admin/candidates.jade index 0a2d85f96..c13f34702 100644 --- a/app/templates/admin/candidates.jade +++ b/app/templates/admin/candidates.jade @@ -43,17 +43,17 @@ block content ul.nav.nav-pills li.active a(href="#featured-candidates", data-toggle="tab") - span(data-i18n="employers.featured_developers") Featured Developers + span.spr(data-i18n="employers.featured_developers") Featured Developers | (#{featuredCandidates.length}) if otherCandidates.length li a(href="#other-candidates", data-toggle="tab") - span(data-i18n="employers.other_developers") Other Developers + span.spr(data-i18n="employers.other_developers") Other Developers | (#{otherCandidates.length}) if me.isAdmin() && inactiveCandidates.length li a(href="#inactive-candidates", data-toggle="tab") - span(data-i18n="employers.inactive_developers") Inactive Developers + span.spr(data-i18n="employers.inactive_developers") Inactive Developers | (#{inactiveCandidates.length}) div.tab-content for area, tabIndex in [{id: "featured-candidates", candidates: featuredCandidates}, {id: "other-candidates", candidates: otherCandidates}, {id: "inactive-candidates", candidates: inactiveCandidates}] @@ -74,7 +74,7 @@ block content th ✓? tbody for candidate, index in area.candidates - - var profile = candidate.get('jobProfile'); + - var profile = candidate.get('jobProfile', true); - var authorized = candidate.id; // If we have the id, then we are authorized. - var profileAge = (new Date() - new Date(profile.updated)) / 86400 / 1000; - var expired = profileAge > 2 * 30.4; diff --git a/app/views/user/JobProfileView.coffee b/app/views/user/JobProfileView.coffee index 9edc938fd..c910522fd 100644 --- a/app/views/user/JobProfileView.coffee +++ b/app/views/user/JobProfileView.coffee @@ -85,6 +85,7 @@ module.exports = class JobProfileView extends UserView $.post "/db/user/#{me.id}/track/view_candidate" $.post "/db/user/#{@userID}/track/viewed_by_employer" unless me.isAdmin() @sessions = @supermodel.loadCollection(new LevelSessionsCollection(@userID), 'candidate_sessions').model + @listenToOnce @sessions, 'sync', => @render?() if me.isAdmin() # Mimicking how the VictoryModal fetches LevelFeedback @remark = new UserRemark() diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee index 3e106e081..25f1335a3 100644 --- a/server/users/user_handler.coffee +++ b/server/users/user_handler.coffee @@ -225,7 +225,7 @@ UserHandler = class UserHandler extends Handler getLevelSessionsForEmployer: (req, res, userID) -> return @sendForbiddenError(res) unless req.user._id+'' is userID or req.user.isAdmin() or ('employer' in (req.user.get('permissions') ? [])) - query = creator: userID, levelID: {$in: ['gridmancer', 'greed', 'dungeon-arena', 'brawlwood', 'gold-rush']} + query = creator: userID, levelID: {$in: ['criss-cross', 'gridmancer', 'greed', 'dungeon-arena', 'brawlwood', 'gold-rush']} projection = 'levelName levelID team playtime codeLanguage submitted code totalScore teamSpells level' LevelSession.find(query).select(projection).exec (err, documents) => return @sendDatabaseError(res, err) if err