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

Merge branch 'master' into pmitros/dexml

Browse Source
This commit is contained in:
Piotr Mitros
2012-06-01 16:00:48 -04:00
parent be1e308dc9 725cbe14d1
commit 16f0da19b0
20 changed files with 403 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
djangoapps/courseware/modules/capa_module.py
View File

@@ -100,7 +100,7 @@ class Module(XModule):
reset_button = False
# We don't need a "save" button if infinite number of attempts and non-randomized
if self.max_attempts == None and self.rerandomize != "always":
if self.max_attempts is None and self.rerandomize != "always":
save_button = False
# Check if explanation is available, and if so, give a link
@@ -225,7 +225,7 @@ class Module(XModule):
''' Is the student still allowed to submit answers? '''
if self.attempts == self.max_attempts:
return True
if self.close_date != None and datetime.datetime.utcnow() > self.close_date:
if self.close_date is not None and datetime.datetime.utcnow() > self.close_date:
return True
return False