codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-25 14:04:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3471 from delftswa2016/loggedIn-achievement-error

Browse source 
Error when accessing achievement without being logged in
This commit is contained in:
Scott Erickson 2016-03-30 09:41:01 -07:00
commit 43389ac9b6
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/templates/editor/achievement/edit.jade
View file

@ -2,8 +2,7 @@ extends /templates/base
block content block content
- var authorized = me.isAdmin() || me.isArtisan(); - var authorized = me.isAdmin() || me.isArtisan();
if authorized ol.breadcrumb
ol.breadcrumb
li li
a(href="/editor", data-i18n="editor.main_title") CodeCombat Editors a(href="/editor", data-i18n="editor.main_title") CodeCombat Editors
li li
@ -11,24 +10,21 @@ block content
li.active li.active
| #{view.achievement.attributes.name} | #{view.achievement.attributes.name}
if authorized
button.achievement-tool-button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-all-button Recalculate All button.achievement-tool-button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-all-button Recalculate All
button.achievement-tool-button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-button Recalculate button.achievement-tool-button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-button Recalculate
button.achievement-tool-button(data-i18n="common.delete", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#delete-button Delete button.achievement-tool-button(data-i18n="common.delete", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#delete-button Delete
button.achievement-tool-button(data-i18n="common.save", disabled=(me.isAdmin() === true || me.isArtisan() === true) ? undefined : "true").btn.btn-primary#save-button Save button.achievement-tool-button(data-i18n="common.save", disabled=(me.isAdmin() === true || me.isArtisan() === true) ? undefined : "true").btn.btn-primary#save-button Save
h3(data-i18n="achievement.edit_achievement_title") Edit Achievement h3(data-i18n="achievement.edit_achievement_title") Edit Achievement
span span
|: "#{view.achievement.attributes.name}" |: "#{view.achievement.get('name')}"
#achievement-treema #achievement-treema
#achievement-view.clearfix #achievement-view.clearfix
h3(data-i18n="resources.patches") Patches h3(data-i18n="resources.patches") Patches
.patches-view .patches-view
hr hr
else
.alert.alert-danger
span Admin only. Turn around.

1
app/views/editor/achievement/AchievementEditView.coffee
View file

@ -54,6 +54,7 @@ module.exports = class AchievementEditView extends RootView
afterRender: -> afterRender: ->
super() super()
return unless @supermodel.finished() return unless @supermodel.finished()
@showReadOnly() if me.get('anonymous')
@pushChangesToPreview() @pushChangesToPreview()
@patchesView = @insertSubView(new PatchesView(@achievement), @$el.find('.patches-view')) @patchesView = @insertSubView(new PatchesView(@achievement), @$el.find('.patches-view'))
@patchesView.load() @patchesView.load()