diff --git a/app/views/i18n/I18NEditCampaignView.coffee b/app/views/i18n/I18NEditCampaignView.coffee index 21e2115e0..f50a8eea8 100644 --- a/app/views/i18n/I18NEditCampaignView.coffee +++ b/app/views/i18n/I18NEditCampaignView.coffee @@ -12,7 +12,7 @@ module.exports = class I18NEditCampaignView extends I18NEditModelView if i18n = @model.get('i18n') if name = @model.get('name') @wrapRow 'Campaign short name', ['name'], name, i18n[lang]?.name, [] - if description = @model.get('fullName') - @wrapRow 'Campaign full name', ['fullName'], description, i18n[lang]?.description, [] + if fullName = @model.get('fullName') + @wrapRow 'Campaign full name', ['fullName'], fullName, i18n[lang]?.fullName, [] # TODO: saves to this don't work since Campaigns don't use versioning. What to do? diff --git a/server/achievements/earned_achievement_handler.coffee b/server/achievements/earned_achievement_handler.coffee index 280e3873b..5d65f1927 100644 --- a/server/achievements/earned_achievement_handler.coffee +++ b/server/achievements/earned_achievement_handler.coffee @@ -183,6 +183,7 @@ class EarnedAchievementHandler extends Handler userStream.on 'data', (user) -> ++usersTotal numberRunning += 1 + #return doneWithUser() if usersTotal / total < 0.96 # If it died, we can skip ahead on restart like this. userStream.pause() if numberRunning > 20 # Keep track of a user's already achieved in order to set the notified values correctly @@ -262,7 +263,7 @@ class EarnedAchievementHandler extends Handler #log.debug "Incrementing score for these achievements with #{newTotalPoints - previousPoints}" pointDelta = newTotalPoints - previousPoints pctDone = (100 * usersFinished / total).toFixed(2) - #console.log "Updated points to #{newTotalPoints} (#{if pointDelta < 0 then '' else '+'}#{pointDelta}) for #{user.get('name') or '???'} (#{user.get('_id')}) (#{pctDone}%)" + console.log "Updated points to #{newTotalPoints} (#{if pointDelta < 0 then '' else '+'}#{pointDelta}) for #{user.get('name') or '???'} (#{user.get('_id')}) (#{pctDone}%)" if recalculatingAll update = {$set: {points: newTotalPoints, 'earned.gems': 0, 'earned.heroes': [], 'earned.items': [], 'earned.levels': []}} else