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

Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged

Browse Source
This commit is contained in:
Valera Rozuvan
2013-02-25 12:57:31 +02:00
parent 5a62eae726 0f7db9e54d
commit 6f16455e70
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/lib/xmodule/xmodule/poll_module.py
View File

@@ -75,7 +75,8 @@ class PollModule(XModule):
'poll_answers': self.poll_answers,
'total': sum(self.poll_answers.values())
})
elif dispatch == 'reset_poll' and self.voted:
elif dispatch == 'reset_poll' and self.voted and \
self.descriptor.xml_attributes.get('reset'):
self.voted = False
# FIXME: fix this, when xblock will support mutable types.
@@ -131,7 +132,7 @@ class PollModule(XModule):
'poll_answer': self.poll_answer,
'poll_answers': self.poll_answers if self.voted else {},
'total': sum(self.poll_answers.values()) if self.voted else 0,
'reset': self.descriptor.xml_attributes.get('reset', True)})
'reset': str(self.descriptor.xml_attributes.get('reset', 'true')).lower()})
class PollDescriptor(MakoModuleDescriptor, XmlDescriptor):