Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4383 from mlkwaqas/waqas/for156-anonymous-posts-labels-user-roles

Browse Source 
Fix anonymous posts appear are labeled with the logged in user's role
This commit is contained in:
Greg Price
2014-07-14 10:43:25 -04:00
parent 0a73d403d7 f1df9a1093
commit 36352fa501
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/static/coffee/spec/discussion/content_spec.coffee
View File

@@ -2,6 +2,22 @@ describe 'All Content', ->
beforeEach -> beforeEach ->
DiscussionSpecHelper.setUpGlobals() DiscussionSpecHelper.setUpGlobals()
describe 'Staff and TA Content', ->
beforeEach ->
DiscussionUtil.loadRoles({"Moderator": [567], "Administrator": [567], "Community TA": [567]})
it 'anonymous thread should not include login role label', ->
anon_content = new Content
anon_content.initialize
expect(anon_content.get 'staff_authored').toBe false
expect(anon_content.get 'community_ta_authored').toBe false
it 'general thread should include login role label', ->
anon_content = new Content { user_id: '567' }
anon_content.initialize
expect(anon_content.get 'staff_authored').toBe true
expect(anon_content.get 'community_ta_authored').toBe true
describe 'Content', -> describe 'Content', ->
beforeEach -> beforeEach ->
@content = new Content { @content = new Content {

8
common/static/coffee/src/discussion/content.coffee
View File

@@ -54,8 +54,12 @@ if Backbone?
initialize: -> initialize: ->
Content.addContent @id, @ Content.addContent @id, @
userId = @get('user_id') userId = @get('user_id')
@set('staff_authored', DiscussionUtil.isStaff(userId)) if userId?
@set('community_ta_authored', DiscussionUtil.isTA(userId)) @set('staff_authored', DiscussionUtil.isStaff(userId))
@set('community_ta_authored', DiscussionUtil.isTA(userId))
else
@set('staff_authored', false)
@set('community_ta_authored', false)
if Content.getInfo(@id) if Content.getInfo(@id)
@updateInfo(Content.getInfo(@id)) @updateInfo(Content.getInfo(@id))
@set 'user_url', DiscussionUtil.urlFor('user_profile', userId) @set 'user_url', DiscussionUtil.urlFor('user_profile', userId)