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
e47f8b17
Commit
e47f8b17
authored
May 29, 2013
by
Don Mitchell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Coding consistency changes for code review.
parent
b7cfbe0c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
cms/djangoapps/contentstore/tests/test_contentstore.py
+1
-1
common/lib/xmodule/xmodule/course_module.py
+4
-3
No files found.
cms/djangoapps/contentstore/tests/test_contentstore.py
View file @
e47f8b17
...
@@ -990,7 +990,7 @@ class ContentStoreTest(ModuleStoreTestCase):
...
@@ -990,7 +990,7 @@ class ContentStoreTest(ModuleStoreTestCase):
def
test_metadata_inheritance
(
self
):
def
test_metadata_inheritance
(
self
):
module_store
=
modulestore
(
'direct'
)
module_store
=
modulestore
(
'direct'
)
import_from_xml
(
module_store
,
'common/test/data/'
,
[
'full'
]
,
verbose
=
True
)
import_from_xml
(
module_store
,
'common/test/data/'
,
[
'full'
])
course
=
module_store
.
get_item
(
Location
([
'i4x'
,
'edX'
,
'full'
,
'course'
,
'6.002_Spring_2012'
,
None
]))
course
=
module_store
.
get_item
(
Location
([
'i4x'
,
'edX'
,
'full'
,
'course'
,
'6.002_Spring_2012'
,
None
]))
...
...
common/lib/xmodule/xmodule/course_module.py
View file @
e47f8b17
...
@@ -18,6 +18,7 @@ import json
...
@@ -18,6 +18,7 @@ import json
from
xblock.core
import
Scope
,
List
,
String
,
Object
,
Boolean
from
xblock.core
import
Scope
,
List
,
String
,
Object
,
Boolean
from
.fields
import
Date
from
.fields
import
Date
from
django.utils.timezone
import
UTC
from
django.utils.timezone
import
UTC
from
xmodule.util
import
date_utils
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
...
@@ -743,15 +744,15 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
...
@@ -743,15 +744,15 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
@property
@property
def
first_eligible_appointment_date_text
(
self
):
def
first_eligible_appointment_date_text
(
self
):
return
datetime
.
strftime
(
"
%
b
%
d,
%
Y"
,
self
.
first_eligible_appointment_date
)
return
self
.
first_eligible_appointment_date
.
strftime
(
"
%
b
%
d,
%
Y"
)
@property
@property
def
last_eligible_appointment_date_text
(
self
):
def
last_eligible_appointment_date_text
(
self
):
return
datetime
.
strftime
(
"
%
b
%
d,
%
Y"
,
self
.
last_eligible_appointment_date
)
return
self
.
last_eligible_appointment_date
.
strftime
(
"
%
b
%
d,
%
Y"
)
@property
@property
def
registration_end_date_text
(
self
):
def
registration_end_date_text
(
self
):
return
date
time
.
strftime
(
"
%
b
%
d,
%
Y at
%
H:
%
M UTC"
,
self
.
registration_end_date
)
return
date
_utils
.
get_default_time_display
(
self
.
registration_end_date
)
@property
@property
def
current_test_center_exam
(
self
):
def
current_test_center_exam
(
self
):
...
...
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