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
f6cdcdf5
Commit
f6cdcdf5
authored
Dec 21, 2015
by
John Eskew
Committed by
Renzo Lucioni
Mar 01, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove sysadmin feature to import course from git into XML modulestore.
parent
8b287900
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
82 deletions
+1
-82
lms/djangoapps/dashboard/sysadmin.py
+1
-82
lms/djangoapps/dashboard/tests/test_sysadmin.py
+0
-0
No files found.
lms/djangoapps/dashboard/sysadmin.py
View file @
f6cdcdf5
...
@@ -59,10 +59,6 @@ class SysadminDashboardView(TemplateView):
...
@@ -59,10 +59,6 @@ class SysadminDashboardView(TemplateView):
"""
"""
self
.
def_ms
=
modulestore
()
self
.
def_ms
=
modulestore
()
self
.
is_using_mongo
=
True
if
self
.
def_ms
.
get_modulestore_type
(
None
)
==
'xml'
:
self
.
is_using_mongo
=
False
self
.
msg
=
u''
self
.
msg
=
u''
self
.
datatable
=
[]
self
.
datatable
=
[]
super
(
SysadminDashboardView
,
self
)
.
__init__
(
**
kwargs
)
super
(
SysadminDashboardView
,
self
)
.
__init__
(
**
kwargs
)
...
@@ -374,10 +370,7 @@ class Courses(SysadminDashboardView):
...
@@ -374,10 +370,7 @@ class Courses(SysadminDashboardView):
return
_
(
"The git repo location should end with '.git', "
return
_
(
"The git repo location should end with '.git', "
"and be a valid url"
)
"and be a valid url"
)
if
self
.
is_using_mongo
:
return
self
.
import_mongo_course
(
gitloc
,
branch
)
return
self
.
import_mongo_course
(
gitloc
,
branch
)
return
self
.
import_xml_course
(
gitloc
,
branch
)
def
import_mongo_course
(
self
,
gitloc
,
branch
):
def
import_mongo_course
(
self
,
gitloc
,
branch
):
"""
"""
...
@@ -429,80 +422,6 @@ class Courses(SysadminDashboardView):
...
@@ -429,80 +422,6 @@ class Courses(SysadminDashboardView):
msg
+=
u"<pre>{0}</pre>"
.
format
(
escape
(
ret
))
msg
+=
u"<pre>{0}</pre>"
.
format
(
escape
(
ret
))
return
msg
return
msg
def
import_xml_course
(
self
,
gitloc
,
branch
):
"""Imports a git course into the XMLModuleStore"""
msg
=
u''
if
not
getattr
(
settings
,
'GIT_IMPORT_WITH_XMLMODULESTORE'
,
False
):
# Translators: "GIT_IMPORT_WITH_XMLMODULESTORE" is a variable name.
# "XMLModuleStore" and "MongoDB" are database systems. You should not
# translate these names.
return
_
(
'Refusing to import. GIT_IMPORT_WITH_XMLMODULESTORE is '
'not turned on, and it is generally not safe to import '
'into an XMLModuleStore with multithreaded. We '
'recommend you enable the MongoDB based module store '
'instead, unless this is a development environment.'
)
cdir
=
(
gitloc
.
rsplit
(
'/'
,
1
)[
1
])[:
-
4
]
gdir
=
settings
.
DATA_DIR
/
cdir
if
os
.
path
.
exists
(
gdir
):
msg
+=
_
(
"The course {0} already exists in the data directory! "
"(reloading anyway)"
)
.
format
(
cdir
)
cmd
=
[
'git'
,
'pull'
,
]
cwd
=
gdir
else
:
cmd
=
[
'git'
,
'clone'
,
gitloc
,
]
cwd
=
settings
.
DATA_DIR
cwd
=
os
.
path
.
abspath
(
cwd
)
try
:
cmd_output
=
escape
(
subprocess
.
check_output
(
cmd
,
stderr
=
subprocess
.
STDOUT
,
cwd
=
cwd
)
)
except
subprocess
.
CalledProcessError
as
ex
:
log
.
exception
(
'Git pull or clone output was:
%
r'
,
ex
.
output
)
# Translators: unable to download the course content from
# the source git repository. Clone occurs if this is brand
# new, and pull is when it is being updated from the
# source.
return
_
(
'Unable to clone or pull repository. Please check '
'your url. Output was: {0!r}'
)
.
format
(
ex
.
output
)
msg
+=
u'<pre>{0}</pre>'
.
format
(
cmd_output
)
if
not
os
.
path
.
exists
(
gdir
):
msg
+=
_
(
'Failed to clone repository to {directory_name}'
)
.
format
(
directory_name
=
gdir
)
return
msg
# Change branch if specified
if
branch
:
try
:
git_import
.
switch_branch
(
branch
,
gdir
)
except
GitImportError
as
ex
:
return
str
(
ex
)
# Translators: This is a git repository branch, which is a
# specific version of a courses content
msg
+=
u'<p>{0}</p>'
.
format
(
_
(
'Successfully switched to branch: '
'{branch_name}'
)
.
format
(
branch_name
=
branch
))
self
.
def_ms
.
try_load_course
(
os
.
path
.
abspath
(
gdir
))
errlog
=
self
.
def_ms
.
errored_courses
.
get
(
cdir
,
''
)
if
errlog
:
msg
+=
u'<hr width="50
%
"><pre>{0}</pre>'
.
format
(
escape
(
errlog
))
else
:
course
=
self
.
def_ms
.
courses
[
os
.
path
.
abspath
(
gdir
)]
msg
+=
_
(
'Loaded course {course_name}<br/>Errors:'
)
.
format
(
course_name
=
"{} {}"
.
format
(
cdir
,
course
.
display_name
)
)
errors
=
self
.
def_ms
.
get_course_errors
(
course
.
id
)
if
not
errors
:
msg
+=
u'None'
else
:
msg
+=
u'<ul>'
for
(
summary
,
err
)
in
errors
:
msg
+=
u'<li><pre>{0}: {1}</pre></li>'
.
format
(
escape
(
summary
),
escape
(
err
))
msg
+=
u'</ul>'
return
msg
def
make_datatable
(
self
):
def
make_datatable
(
self
):
"""Creates course information datatable"""
"""Creates course information datatable"""
...
...
lms/djangoapps/dashboard/tests/test_sysadmin.py
View file @
f6cdcdf5
This diff is collapsed.
Click to expand it.
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