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
99584aab
Commit
99584aab
authored
Jul 09, 2013
by
cahrens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pep8 cleanup
parent
6a499805
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
11 deletions
+8
-11
cms/djangoapps/auth/tests/test_authz.py
+0
-1
cms/djangoapps/course_creators/models.py
+7
-6
cms/djangoapps/course_creators/tests/test_views.py
+0
-1
cms/urls.py
+1
-3
No files found.
cms/djangoapps/auth/tests/test_authz.py
View file @
99584aab
...
...
@@ -200,4 +200,3 @@ class CourseGroupTest(TestCase):
add_user_to_course_group
(
creator2
,
staff2
,
location2
,
STAFF_ROLE_NAME
)
self
.
assertSetEqual
({
self
.
creator
,
creator2
},
get_users_with_instructor_role
())
cms/djangoapps/course_creators/models.py
View file @
99584aab
...
...
@@ -14,11 +14,12 @@ class CourseCreator(models.Model):
"""
Creates the database table model.
"""
STATES
=
((
u'u'
,
u'unrequested'
),
(
u'p'
,
u'pending'
),
(
u'g'
,
u'granted'
),
(
u'd'
,
u'denied'
),
)
STATES
=
(
(
u'u'
,
u'unrequested'
),
(
u'p'
,
u'pending'
),
(
u'g'
,
u'granted'
),
(
u'd'
,
u'denied'
),
)
user
=
models
.
ForeignKey
(
User
,
help_text
=
"Studio user"
,
unique
=
True
)
state_changed
=
models
.
DateTimeField
(
'state last updated'
,
auto_now_add
=
True
,
...
...
@@ -29,7 +30,7 @@ class CourseCreator(models.Model):
'why course creation access was denied)'
)
def
__unicode__
(
self
):
s
=
"
%
str
%
str |
%
str [
%
str] |
%
str"
%
(
self
.
user
.
username
,
self
.
user
.
email
,
self
.
state
,
self
.
state_changed
,
self
.
note
)
s
=
"
%
str
|
%
str [
%
str] |
%
str"
%
(
self
.
user
,
self
.
state
,
self
.
state_changed
,
self
.
note
)
return
s
...
...
cms/djangoapps/course_creators/tests/test_views.py
View file @
99584aab
...
...
@@ -58,4 +58,3 @@ class CourseCreatorView(TestCase):
self
.
assertEqual
(
'g'
,
get_course_creator_status
(
self
.
user
))
self
.
assertTrue
(
is_user_in_creator_group
(
self
.
user
))
cms/urls.py
View file @
99584aab
...
...
@@ -146,9 +146,7 @@ if settings.MITX_FEATURES.get('ENABLE_SERVICE_STATUS'):
url
(
r'^status/'
,
include
(
'service_status.urls'
)),
)
urlpatterns
+=
(
url
(
r'^admin/'
,
include
(
admin
.
site
.
urls
)),
)
urlpatterns
+=
(
url
(
r'^admin/'
,
include
(
admin
.
site
.
urls
)),)
urlpatterns
=
patterns
(
*
urlpatterns
)
...
...
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