From 4db433c062bf8fa042e745d393d3f2a3f97dd14e Mon Sep 17 00:00:00 2001 From: IngridMorstrad Date: Sun, 16 Mar 2014 17:25:19 +0530 Subject: [PATCH 1/3] Fixes #566, admin on localhost by default --- server/users/User.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/users/User.coffee b/server/users/User.coffee index d167b2d73..29d0d0a1f 100644 --- a/server/users/User.coffee +++ b/server/users/User.coffee @@ -22,6 +22,7 @@ UserSchema.pre('init', (next) -> UserSchema.post('init', -> @set('anonymous', false) if @get('email') @currentSubscriptions = JSON.stringify(@get('emailSubscriptions')) + @set('permissions', ['admin']) if not isProduction ) UserSchema.methods.isAdmin = -> @@ -90,4 +91,4 @@ UserSchema.statics.hashPassword = (password) -> shasum.update(salt + password) shasum.digest('hex') -module.exports = User = mongoose.model('User', UserSchema) \ No newline at end of file +module.exports = User = mongoose.model('User', UserSchema) From 8d9a8aaf7387b757411217006a8f4e0b2ec4300a Mon Sep 17 00:00:00 2001 From: IngridMorstrad Date: Sun, 16 Mar 2014 21:16:00 +0530 Subject: [PATCH 2/3] Change victory.jade to use the base template --- app/templates/play/level/modal/victory.jade | 25 +++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/app/templates/play/level/modal/victory.jade b/app/templates/play/level/modal/victory.jade index 45c7f567f..3be9372bd 100644 --- a/app/templates/play/level/modal/victory.jade +++ b/app/templates/play/level/modal/victory.jade @@ -1,19 +1,16 @@ -// TODO: refactor to be like other modals +extends /templates/modal/modal_base -.modal-dialog +block modal-header-content + h3 + span(data-i18n="play_level.victory_title_prefix") + span= levelName + span(data-i18n="play_level.victory_title_suffix") Complete - .modal-header - button(type='button', data-dismiss="modal", aria-hidden="true").close × - h3 - span(data-i18n="play_level.victory_title_prefix") - span= levelName - span(data-i18n="play_level.victory_title_suffix") Complete - - .modal-body - img.victory-banner(src="/images/level/victory.png", alt="") - div!= body +block modal-body-content + img.victory-banner(src="/images/level/victory.png", alt="") + div!= body - .modal-footer +block modal-footer if level.get('type') === 'ladder' a.btn.btn-primary(href="/play/ladder/#{level.get('slug')}#my-matches", data-dismiss="modal", data-i18n="play_level.victory_go_home") Go Home else if hasNextLevel @@ -45,7 +42,7 @@ iframe.github-star-button(src="http://ghbtns.com/github-btn.html?user=codecombat&repo=codecombat&type=watch&count=true", allowtransparency="true", frameborder="0", scrolling="0", width="110", height="20") if showHourOfCodeDoneButton - .modal-footer + block modal-footer h3.pull-left(data-i18n="play_level.victory_hour_of_code_done") Are You Done? a(href="http://code.org/api/hour/finish") strong(data-i18n="play_level.victory_hour_of_code_done_yes") Yes, I'm finished with my Hour of Code! From 37e3cd65daf65de6a969c648a7c3c96c3a15cdd1 Mon Sep 17 00:00:00 2001 From: IngridMorstrad Date: Sun, 16 Mar 2014 21:56:29 +0530 Subject: [PATCH 3/3] User now set to admin at signup instead of login --- server/users/User.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/users/User.coffee b/server/users/User.coffee index 29d0d0a1f..7b9669ee2 100644 --- a/server/users/User.coffee +++ b/server/users/User.coffee @@ -16,13 +16,13 @@ UserSchema.pre('init', (next) -> return next() unless jsonschema.properties? for prop, sch of jsonschema.properties @set(prop, sch.default) if sch.default? + @set('permissions', ['admin']) if not isProduction next() ) UserSchema.post('init', -> @set('anonymous', false) if @get('email') @currentSubscriptions = JSON.stringify(@get('emailSubscriptions')) - @set('permissions', ['admin']) if not isProduction ) UserSchema.methods.isAdmin = ->