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

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2014-08-18 14:09:02 -07:00
commit 071f006acf
2 changed files with 3 additions and 1 deletions

2
app/views/editor/level/RelatedAchievementsView.coffee
View file

@ -16,7 +16,7 @@ module.exports = class RelatedAchievementsView extends CocoView
constructor: (options) -> constructor: (options) ->
super options super options
@level = options.level @level = options.level
@relatedID = @level.id @relatedID = @level.get('original')
@achievements = new RelatedAchievementsCollection @relatedID @achievements = new RelatedAchievementsCollection @relatedID
@supermodel.loadCollection @achievements, 'achievements' @supermodel.loadCollection @achievements, 'achievements'

2
app/views/editor/level/modals/NewAchievementModal.coffee
View file

@ -37,6 +37,7 @@ module.exports = class NewAchievementModal extends NewModelModal
query = subQueries[0] query = subQueries[0]
else else
query = $or: subQueries query = $or: subQueries
query['level.original'] = @level.get 'original'
query query
makeNewModel: -> makeNewModel: ->
@ -50,5 +51,6 @@ module.exports = class NewAchievementModal extends NewModelModal
achievement.set 'query', query achievement.set 'query', query
achievement.set 'collection', 'level.sessions' achievement.set 'collection', 'level.sessions'
achievement.set 'userField', 'creator' achievement.set 'userField', 'creator'
achievement.set 'related', @level.get('original')
achievement achievement