Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
fedc68dd
Commit
fedc68dd
authored
Feb 05, 2013
by
Alexander Kryklia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplified workaround
parent
d1f13bf9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
12 deletions
+9
-12
common/lib/xmodule/xmodule/poll_module.py
+9
-12
No files found.
common/lib/xmodule/xmodule/poll_module.py
View file @
fedc68dd
...
@@ -71,14 +71,12 @@ class PollModule(XModule):
...
@@ -71,14 +71,12 @@ class PollModule(XModule):
Returns:
Returns:
dict
dict
"""
"""
if
dispatch
in
self
.
poll_answers
and
not
self
.
voted
:
if
dispatch
in
self
.
poll_answers
:
# and not self.voted:
tmp
=
{}
d
=
self
.
poll_answers
for
key
in
self
.
poll_answers
:
d
[
dispatch
]
+=
1
tmp
[
key
]
=
self
.
poll_answers
[
key
]
tmp
[
dispatch
]
+=
1
self
.
voted
=
True
self
.
voted
=
True
self
.
poll_answer
=
dispatch
self
.
poll_answer
=
dispatch
self
.
poll_answers
=
tmp
self
.
poll_answers
=
d
return
json
.
dumps
({
'poll_answers'
:
self
.
poll_answers
,
return
json
.
dumps
({
'poll_answers'
:
self
.
poll_answers
,
'total'
:
sum
(
self
.
poll_answers
.
values
()),
'total'
:
sum
(
self
.
poll_answers
.
values
()),
'callback'
:
{
'objectName'
:
'Conditional'
}
'callback'
:
{
'objectName'
:
'Conditional'
}
...
@@ -103,18 +101,17 @@ class PollModule(XModule):
...
@@ -103,18 +101,17 @@ class PollModule(XModule):
xml_object_copy
=
deepcopy
(
self
.
xml_object
)
xml_object_copy
=
deepcopy
(
self
.
xml_object
)
answers_to_json
=
{}
answers_to_json
=
{}
#workaround
#workaround
tmp
=
{}
d
=
self
.
poll_answers
for
key
in
self
.
poll_answers
:
# Fill self.poll_answers, prepare data for template context.
tmp
[
key
]
=
self
.
poll_answers
[
key
]
for
element_answer
in
xml_object_copy
.
findall
(
'answer'
):
for
element_answer
in
xml_object_copy
.
findall
(
'answer'
):
answer
=
element_answer
.
get
(
'id'
,
None
)
answer
=
element_answer
.
get
(
'id'
,
None
)
if
answer
:
if
answer
:
if
answer
not
in
tmp
:
if
answer
not
in
d
:
tmp
[
answer
]
=
0
d
[
answer
]
=
0
answers_to_json
[
answer
]
=
\
answers_to_json
[
answer
]
=
\
cgi
.
escape
(
stringify_children
(
element_answer
))
cgi
.
escape
(
stringify_children
(
element_answer
))
xml_object_copy
.
remove
(
element_answer
)
xml_object_copy
.
remove
(
element_answer
)
self
.
poll_answers
=
tmp
self
.
poll_answers
=
d
return
json
.
dumps
({
'answers'
:
answers_to_json
,
return
json
.
dumps
({
'answers'
:
answers_to_json
,
'question'
:
cgi
.
escape
(
stringify_children
(
xml_object_copy
)),
'question'
:
cgi
.
escape
(
stringify_children
(
xml_object_copy
)),
# to show answered poll after reload:
# to show answered poll after reload:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment