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
84f2cc8a
Commit
84f2cc8a
authored
Mar 26, 2013
by
Carlos Andrés Rocha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display advertised date correctly if it is an ISO date
parent
0612b0eb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
1 deletions
+26
-1
common/lib/xmodule/xmodule/course_module.py
+10
-1
common/lib/xmodule/xmodule/tests/test_course_module.py
+16
-0
No files found.
common/lib/xmodule/xmodule/course_module.py
View file @
84f2cc8a
...
...
@@ -635,8 +635,17 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
@property
def
start_date_text
(
self
):
def
try_parse_iso_8601
(
text
):
try
:
result
=
datetime
.
strptime
(
text
,
"
%
Y-
%
m-
%
dT
%
H:
%
M"
)
result
=
result
.
strftime
(
"
%
b
%
d,
%
Y"
)
except
ValueError
:
result
=
text
.
title
()
return
result
if
isinstance
(
self
.
advertised_start
,
basestring
):
return
self
.
advertised_start
return
try_parse_iso_8601
(
self
.
advertised_start
)
elif
self
.
advertised_start
is
None
and
self
.
start
is
None
:
return
'TBD'
else
:
...
...
common/lib/xmodule/xmodule/tests/test_course_module.py
View file @
84f2cc8a
import
unittest
from
time
import
strptime
from
fs.memoryfs
import
MemoryFS
from
mock
import
Mock
,
patch
...
...
@@ -108,7 +109,22 @@ class IsNewCourseTestCase(unittest.TestCase):
print
"Comparing
%
s to
%
s"
%
(
a
,
b
)
assertion
(
a_score
,
b_score
)
@patch
(
'xmodule.course_module.time.gmtime'
)
def
test_start_date_text
(
self
,
gmtime_mock
):
gmtime_mock
.
return_value
=
NOW
settings
=
[
# start, advertized, result
(
'2012-12-02T12:00'
,
None
,
'Dec 02, 2012'
),
(
'2012-12-02T12:00'
,
'2011-11-01T12:00'
,
'Nov 01, 2011'
),
(
'2012-12-02T12:00'
,
'Spring 2012'
,
'Spring 2012'
),
(
'2012-12-02T12:00'
,
'November, 2011'
,
'November, 2011'
),
]
for
s
in
settings
:
d
=
self
.
get_dummy_course
(
start
=
s
[
0
],
advertised_start
=
s
[
1
])
print
"Checking start=
%
s advertised=
%
s"
%
(
s
[
0
],
s
[
1
])
self
.
assertEqual
(
d
.
start_date_text
,
s
[
2
])
@patch
(
'xmodule.course_module.time.gmtime'
)
def
test_is_newish
(
self
,
gmtime_mock
):
...
...
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