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
ef0828fc
Commit
ef0828fc
authored
Aug 19, 2013
by
Julian Arni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Behave properly on non-tar-gz files
parent
eaa4b3ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
11 deletions
+41
-11
cms/templates/import.html
+41
-11
No files found.
cms/templates/import.html
View file @
ef0828fc
...
...
@@ -60,7 +60,6 @@ var submitBtn = $('.submit-button');
$
(
'#fileupload'
).
fileupload
({
dataType
:
'json'
,
type
:
'POST'
,
...
...
@@ -68,18 +67,35 @@ $('#fileupload').fileupload({
autoUpload
:
false
,
options
:
{
acceptFileTypes
:
/
(\.
|
\/)
tar
\.
gz$/i
,
processQueue
:
[{
action
:
'validate'
,
acceptFileTypes
:
'@'
}]
},
add
:
function
(
e
,
data
)
{
submitBtn
.
show
().
click
(
function
(
e
){
e
.
preventDefault
();
data
.
submit
().
complete
(
function
(
result
,
textStatus
,
xhr
)
{
if
(
result
.
status
!=
200
)
{
alert
(
'${_("Your import has failed.")}
\
n
\
n'
+
JSON
.
parse
(
result
.
responseText
)[
"ErrMsg"
]);
submitBtn
.
show
();
bar
.
hide
();
}
var
file
=
data
.
files
[
0
];
if
(
file
.
type
==
"application/x-gzip"
)
{
submitBtn
.
click
(
function
(
e
){
e
.
preventDefault
();
data
.
submit
().
complete
(
function
(
result
,
textStatus
,
xhr
)
{
if
(
result
.
status
!=
200
)
{
alert
(
'${_("Your import has failed.")}
\
n
\
n'
+
JSON
.
parse
(
result
.
responseText
)[
"ErrMsg"
]);
submitBtn
.
show
();
bar
.
hide
();
}
else
{
bar
.
hide
()
alert
(
'${_("Your import was successful.")}'
);
window
.
location
=
'${successful_import_redirect_url}'
;
}
});
});
});
}
else
{
data
.
files
=
[];
}
},
progressall
:
function
(
e
,
data
){
...
...
@@ -93,6 +109,20 @@ $('#fileupload').fileupload({
alert
(
'${_("Your import was successful.")}'
);
window
.
location
=
'${successful_import_redirect_url}'
;
},
processActions
:
{
validate
:
function
(
data
,
options
)
{
var
dfdata
=
$
.
Deferred
(),
file
=
data
.
files
[
data
.
index
];
if
(
!
options
.
acceptFileTypes
.
test
(
file
.
type
))
{
file
.
error
=
'Invalid file type: must be a tar.gz file!'
;
dfdata
.
rejectWith
(
this
,
[
data
]);
}
else
{
dfdata
.
resolveWith
(
this
,
[
data
]);
}
return
dfdata
.
promise
();
}
}
});
...
...
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