mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-27 09:35:39 -05:00
Merge pull request #3471 from delftswa2016/loggedIn-achievement-error
Error when accessing achievement without being logged in
This commit is contained in:
commit
43389ac9b6
2 changed files with 11 additions and 14 deletions
|
@ -2,8 +2,7 @@ extends /templates/base
|
|||
|
||||
block content
|
||||
- var authorized = me.isAdmin() || me.isArtisan();
|
||||
if authorized
|
||||
ol.breadcrumb
|
||||
ol.breadcrumb
|
||||
li
|
||||
a(href="/editor", data-i18n="editor.main_title") CodeCombat Editors
|
||||
li
|
||||
|
@ -11,24 +10,21 @@ block content
|
|||
li.active
|
||||
| #{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-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.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
|
||||
span
|
||||
|: "#{view.achievement.attributes.name}"
|
||||
h3(data-i18n="achievement.edit_achievement_title") Edit Achievement
|
||||
span
|
||||
|: "#{view.achievement.get('name')}"
|
||||
|
||||
#achievement-treema
|
||||
#achievement-treema
|
||||
|
||||
#achievement-view.clearfix
|
||||
#achievement-view.clearfix
|
||||
|
||||
h3(data-i18n="resources.patches") Patches
|
||||
.patches-view
|
||||
h3(data-i18n="resources.patches") Patches
|
||||
.patches-view
|
||||
|
||||
hr
|
||||
|
||||
else
|
||||
.alert.alert-danger
|
||||
span Admin only. Turn around.
|
||||
hr
|
||||
|
|
|
@ -54,6 +54,7 @@ module.exports = class AchievementEditView extends RootView
|
|||
afterRender: ->
|
||||
super()
|
||||
return unless @supermodel.finished()
|
||||
@showReadOnly() if me.get('anonymous')
|
||||
@pushChangesToPreview()
|
||||
@patchesView = @insertSubView(new PatchesView(@achievement), @$el.find('.patches-view'))
|
||||
@patchesView.load()
|
||||
|
|
Loading…
Reference in a new issue