From 2dfe39aafdff68ded984bb7190d7a6acb8c38fda Mon Sep 17 00:00:00 2001 From: Scott Erickson <sderickson@gmail.com> Date: Fri, 29 Aug 2014 12:28:45 -0700 Subject: [PATCH] Migrated Achievement model's getExpFunction to use the new defaults system. --- app/models/Achievement.coffee | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/models/Achievement.coffee b/app/models/Achievement.coffee index 47b5391d6..93434d728 100644 --- a/app/models/Achievement.coffee +++ b/app/models/Achievement.coffee @@ -9,12 +9,9 @@ module.exports = class Achievement extends CocoModel isRepeatable: -> @get('proportionalTo')? - # TODO logic is duplicated in Mongoose Achievement schema getExpFunction: -> - # TODO DEFAULTS - kind = @get('function')?.kind or jsonschema.properties.function.default.kind - parameters = @get('function')?.parameters or jsonschema.properties.function.default.parameters - return utils.functionCreators[kind](parameters) if kind of utils.functionCreators + func = @get('function', true) + return utils.functionCreators[func.kind](func.parameters) if func.kind of utils.functionCreators @styleMapping: 1: 'achievement-wood'