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
979e3be1
Commit
979e3be1
authored
May 13, 2013
by
Steve Strassmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix pep8: imports and blank lines
parent
5ab6d472
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
46 additions
and
39 deletions
+46
-39
cms/djangoapps/contentstore/views/__init__.py
+0
-1
cms/djangoapps/contentstore/views/access.py
+1
-0
cms/djangoapps/contentstore/views/assets.py
+8
-2
cms/djangoapps/contentstore/views/checklist.py
+1
-4
cms/djangoapps/contentstore/views/component.py
+3
-21
cms/djangoapps/contentstore/views/course.py
+4
-3
cms/djangoapps/contentstore/views/error.py
+0
-2
cms/djangoapps/contentstore/views/item.py
+0
-1
cms/djangoapps/contentstore/views/public.py
+2
-1
cms/djangoapps/contentstore/views/requests.py
+4
-1
cms/djangoapps/contentstore/views/session_kv_store.py
+1
-0
cms/djangoapps/contentstore/views/tabs.py
+21
-0
cms/djangoapps/contentstore/views/user.py
+1
-3
No files found.
cms/djangoapps/contentstore/views/__init__.py
View file @
979e3be1
...
...
@@ -9,4 +9,3 @@ from public import *
from
user
import
*
from
tabs
import
*
from
requests
import
*
cms/djangoapps/contentstore/views/access.py
View file @
979e3be1
...
...
@@ -3,6 +3,7 @@ from auth.authz import is_user_in_course_group_role
from
contentstore.utils
import
get_course_location_for_item
from
django.core.exceptions
import
PermissionDenied
def
get_location_and_verify_access
(
request
,
org
,
course
,
name
):
"""
Create the location tuple verify that the user has permissions
...
...
cms/djangoapps/contentstore/views/assets.py
View file @
979e3be1
import
logging
,
json
,
os
,
tarfile
,
shutil
import
logging
import
json
import
os
import
tarfile
import
shutil
from
tempfile
import
mkdtemp
from
path
import
path
...
...
@@ -27,6 +31,7 @@ from auth.authz import create_all_course_groups
__all__
=
[
'asset_index'
,
'upload_asset'
,
'import_course'
,
'generate_export_course'
,
'export_course'
]
@login_required
@ensure_csrf_cookie
def
asset_index
(
request
,
org
,
course
,
name
):
...
...
@@ -135,6 +140,7 @@ def upload_asset(request, org, course, coursename):
response
[
'asset_url'
]
=
StaticContent
.
get_url_path_from_location
(
content
.
location
)
return
response
@ensure_csrf_cookie
@login_required
def
import_course
(
request
,
org
,
course
,
name
):
...
...
@@ -240,6 +246,7 @@ def generate_export_course(request, org, course, name):
response
[
'Content-Length'
]
=
os
.
path
.
getsize
(
export_file
.
name
)
return
response
@ensure_csrf_cookie
@login_required
def
export_course
(
request
,
org
,
course
,
name
):
...
...
@@ -253,4 +260,3 @@ def export_course(request, org, course, name):
'active_tab'
:
'export'
,
'successful_import_redirect_url'
:
''
})
cms/djangoapps/contentstore/views/checklist.py
View file @
979e3be1
...
...
@@ -14,6 +14,7 @@ from access import get_location_and_verify_access
__all__
=
[
'get_checklists'
,
'update_checklist'
]
@ensure_csrf_cookie
@login_required
def
get_checklists
(
request
,
org
,
course
,
name
):
...
...
@@ -101,7 +102,3 @@ def expand_checklist_action_urls(course_module):
modified
=
True
return
checklists
,
modified
cms/djangoapps/contentstore/views/component.py
View file @
979e3be1
import
json
,
logging
import
json
import
logging
from
collections
import
defaultdict
from
django.http
import
HttpResponse
,
HttpResponseBadRequest
,
HttpResponseForbidden
...
...
@@ -23,7 +24,7 @@ from contentstore.utils import get_modulestore, get_lms_link_for_item, \
from
models.settings.course_grading
import
CourseGradingModel
from
requests
import
get_request_method
,
_xmodule_recurse
from
access
import
has_access
,
get_location_and_verify_access
from
access
import
has_access
# TODO: should explicitly enumerate exports with __all__
...
...
@@ -269,23 +270,6 @@ def unpublish_unit(request):
return
HttpResponse
()
@login_required
@ensure_csrf_cookie
def
static_pages
(
request
,
org
,
course
,
coursename
):
location
=
get_location_and_verify_access
(
request
,
org
,
course
,
coursename
)
course
=
modulestore
()
.
get_item
(
location
)
return
render_to_response
(
'static-pages.html'
,
{
'active_tab'
:
'pages'
,
'context_course'
:
course
,
})
def
edit_static
(
request
,
org
,
course
,
coursename
):
return
render_to_response
(
'edit-static-page.html'
,
{})
@expect_json
@login_required
@ensure_csrf_cookie
...
...
@@ -311,5 +295,3 @@ def module_info(request, module_location):
return
HttpResponse
(
json
.
dumps
(
set_module_info
(
get_modulestore
(
location
),
location
,
request
.
POST
)),
mimetype
=
"application/json"
)
else
:
return
HttpResponseBadRequest
()
cms/djangoapps/contentstore/views/course.py
View file @
979e3be1
import
json
,
time
import
json
import
time
from
django.contrib.auth.decorators
import
login_required
from
django_future.csrf
import
ensure_csrf_cookie
...
...
@@ -27,6 +28,7 @@ from component import OPEN_ENDED_COMPONENT_TYPES, ADVANCED_COMPONENT_POLICY_KEY
# TODO: should explicitly enumerate exports with __all__
@login_required
@ensure_csrf_cookie
def
course_index
(
request
,
org
,
course
,
name
):
...
...
@@ -188,6 +190,7 @@ def course_info_updates(request, org, course, provided_id=None):
return
HttpResponseBadRequest
(
"Failed to save"
,
content_type
=
"text/plain"
)
@login_required
@ensure_csrf_cookie
def
get_course_settings
(
request
,
org
,
course
,
name
):
...
...
@@ -362,5 +365,3 @@ def course_advanced_updates(request, org, course, name):
filter_tabs
=
False
response_json
=
json
.
dumps
(
CourseMetadata
.
update_from_json
(
location
,
request_body
,
filter_tabs
=
filter_tabs
))
return
HttpResponse
(
response_json
,
mimetype
=
"application/json"
)
cms/djangoapps/contentstore/views/error.py
View file @
979e3be1
...
...
@@ -19,5 +19,3 @@ def render_404(request):
def
render_500
(
request
):
return
HttpResponseServerError
(
render_to_string
(
'500.html'
,
{}))
cms/djangoapps/contentstore/views/item.py
View file @
979e3be1
...
...
@@ -136,4 +136,3 @@ def delete_item(request):
modulestore
(
'direct'
)
.
update_children
(
parent
.
location
,
parent
.
children
)
return
HttpResponse
()
cms/djangoapps/contentstore/views/public.py
View file @
979e3be1
...
...
@@ -14,6 +14,7 @@ __all__ = ['signup', 'old_login_redirect', 'login_page', 'howitworks', 'ux_alert
Public views
"""
@ensure_csrf_cookie
def
signup
(
request
):
"""
...
...
@@ -49,9 +50,9 @@ def howitworks(request):
else
:
return
render_to_response
(
'howitworks.html'
,
{})
def
ux_alerts
(
request
):
"""
static/proof-of-concept views
"""
return
render_to_response
(
'ux-alerts.html'
,
{})
cms/djangoapps/contentstore/views/requests.py
View file @
979e3be1
...
...
@@ -5,10 +5,12 @@ from mitxmako.shortcuts import render_to_string, render_to_response
__all__
=
[
'edge'
,
'event'
,
'landing'
]
# points to the temporary course landing page with log in and sign up
def
landing
(
request
,
org
,
course
,
coursename
):
return
render_to_response
(
'temp-course-landing.html'
,
{})
# points to the temporary edge page
def
edge
(
request
):
return
render_to_response
(
'university_profiles/edge.html'
,
{})
...
...
@@ -35,6 +37,7 @@ def get_request_method(request):
return
real_method
def
create_json_response
(
errmsg
=
None
):
if
errmsg
is
not
None
:
resp
=
HttpResponse
(
json
.
dumps
({
'Status'
:
'Failed'
,
'ErrMsg'
:
errmsg
}))
...
...
@@ -42,6 +45,7 @@ def create_json_response(errmsg=None):
resp
=
HttpResponse
(
json
.
dumps
({
'Status'
:
'OK'
}))
return
resp
def
render_from_lms
(
template_name
,
dictionary
,
context
=
None
,
namespace
=
'main'
):
"""
Render a template using the LMS MAKO_TEMPLATES
...
...
@@ -54,4 +58,3 @@ def _xmodule_recurse(item, action):
_xmodule_recurse
(
child
,
action
)
action
(
item
)
cms/djangoapps/contentstore/views/session_kv_store.py
View file @
979e3be1
from
xblock.runtime
import
KeyValueStore
,
InvalidScopeError
class
SessionKeyValueStore
(
KeyValueStore
):
def
__init__
(
self
,
request
,
model_data
):
self
.
_model_data
=
model_data
...
...
cms/djangoapps/contentstore/views/tabs.py
View file @
979e3be1
...
...
@@ -11,9 +11,11 @@ from xmodule.modulestore import Location
from
xmodule.modulestore.inheritance
import
own_metadata
from
xmodule.modulestore.django
import
modulestore
from
contentstore.utils
import
get_course_for_item
from
access
import
get_location_and_verify_access
__all__
=
[
'edit_tabs'
,
'reorder_static_tabs'
]
def
initialize_course_tabs
(
course
):
# set up the default tabs
# I've added this because when we add static tabs, the LMS either expects a None for the tabs list or
...
...
@@ -75,6 +77,7 @@ def reorder_static_tabs(request):
modulestore
(
'direct'
)
.
update_metadata
(
course
.
location
,
own_metadata
(
course
))
return
HttpResponse
()
@login_required
@ensure_csrf_cookie
def
edit_tabs
(
request
,
org
,
course
,
coursename
):
...
...
@@ -109,3 +112,21 @@ def edit_tabs(request, org, course, coursename):
'context_course'
:
course_item
,
'components'
:
components
})
@login_required
@ensure_csrf_cookie
def
static_pages
(
request
,
org
,
course
,
coursename
):
location
=
get_location_and_verify_access
(
request
,
org
,
course
,
coursename
)
course
=
modulestore
()
.
get_item
(
location
)
return
render_to_response
(
'static-pages.html'
,
{
'active_tab'
:
'pages'
,
'context_course'
:
course
,
})
def
edit_static
(
request
,
org
,
course
,
coursename
):
return
render_to_response
(
'edit-static-page.html'
,
{})
cms/djangoapps/contentstore/views/user.py
View file @
979e3be1
...
...
@@ -61,6 +61,7 @@ def index(request):
'disable_course_creation'
:
settings
.
MITX_FEATURES
.
get
(
'DISABLE_COURSE_CREATION'
,
False
)
and
not
request
.
user
.
is_staff
})
@login_required
@ensure_csrf_cookie
def
manage_users
(
request
,
location
):
...
...
@@ -84,8 +85,6 @@ def manage_users(request, location):
})
@expect_json
@login_required
@ensure_csrf_cookie
...
...
@@ -145,4 +144,3 @@ def remove_user(request, location):
remove_user_from_course_group
(
request
.
user
,
user
,
location
,
STAFF_ROLE_NAME
)
return
create_json_response
()
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