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
e0ab75fb
Commit
e0ab75fb
authored
Aug 19, 2013
by
Julian Arni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for multiple file uploads
parent
547d4419
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
13 deletions
+55
-13
cms/djangoapps/contentstore/views/assets.py
+2
-2
cms/static/js/views/assets.js
+50
-10
cms/templates/asset_index.html
+3
-1
No files found.
cms/djangoapps/contentstore/views/assets.py
View file @
e0ab75fb
...
@@ -149,14 +149,14 @@ def upload_asset(request, org, course, coursename):
...
@@ -149,14 +149,14 @@ def upload_asset(request, org, course, coursename):
logging
.
error
(
'Could not find course'
+
location
)
logging
.
error
(
'Could not find course'
+
location
)
return
HttpResponseBadRequest
()
return
HttpResponseBadRequest
()
if
'file'
not
in
request
.
FILES
:
if
'file
s[]
'
not
in
request
.
FILES
:
return
HttpResponseBadRequest
()
return
HttpResponseBadRequest
()
# compute a 'filename' which is similar to the location formatting, we're
# compute a 'filename' which is similar to the location formatting, we're
# using the 'filename' nomenclature since we're using a FileSystem paradigm
# using the 'filename' nomenclature since we're using a FileSystem paradigm
# here. We're just imposing the Location string formatting expectations to
# here. We're just imposing the Location string formatting expectations to
# keep things a bit more consistent
# keep things a bit more consistent
upload_file
=
request
.
FILES
[
'file'
]
upload_file
=
request
.
FILES
[
'file
s[]
'
]
filename
=
upload_file
.
name
filename
=
upload_file
.
name
mime_type
=
upload_file
.
content_type
mime_type
=
upload_file
.
content_type
...
...
cms/static/js/views/assets.js
View file @
e0ab75fb
$
(
document
).
ready
(
function
()
{
$
(
document
).
ready
(
function
()
{
$
(
'.uploads .upload-button'
).
bind
(
'click'
,
showUploadModal
);
$
(
'.uploads .upload-button'
).
bind
(
'click'
,
showUploadModal
);
$
(
'.upload-modal .close-button'
).
bind
(
'click'
,
hide
Modal
);
$
(
'.upload-modal .close-button'
).
bind
(
'click'
,
resetUpload
Modal
);
$
(
'.upload-modal .choose-file-button'
).
bind
(
'click'
,
showFileSelectionMenu
);
$
(
'.upload-modal .choose-file-button'
).
bind
(
'click'
,
showFileSelectionMenu
);
$
(
'.remove-asset-button'
).
bind
(
'click'
,
removeAsset
);
$
(
'.remove-asset-button'
).
bind
(
'click'
,
removeAsset
);
});
});
...
@@ -52,11 +52,47 @@ function removeAsset(e){
...
@@ -52,11 +52,47 @@ function removeAsset(e){
function
showUploadModal
(
e
)
{
function
showUploadModal
(
e
)
{
e
.
preventDefault
();
e
.
preventDefault
();
resetUploadBar
();
$modal
=
$
(
'.upload-modal'
).
show
();
$modal
=
$
(
'.upload-modal'
).
show
();
$
(
'.upload-modal .file-chooser'
).
fileupload
({
dataType
:
'json'
,
type
:
'POST'
,
maxChunkSize
:
100
*
1000
*
1000
,
// 100 MB
autoUpload
:
true
,
progressall
:
function
(
e
,
data
)
{
var
percentComplete
=
parseInt
(
data
.
loaded
/
data
.
total
*
100
,
10
);
showUploadFeedback
(
e
,
percentComplete
);
},
maxFileSize
:
10
*
1000
*
1000
,
// 100 MB
maxNumberofFiles
:
30
,
add
:
function
(
e
,
data
)
{
// Uncomment this line to get html template on load
// var html = assetUploadTemplate(data.files);
data
.
process
().
done
(
function
()
{
data
.
submit
();
});
},
done
:
function
(
e
,
data
)
{
displayFinishedUpload
(
data
.
result
);
}
});
$
(
'.file-input'
).
bind
(
'change'
,
startUpload
);
$
(
'.file-input'
).
bind
(
'change'
,
startUpload
);
$modalCover
.
show
();
$modalCover
.
show
();
}
}
function
assetUploadTemplate
(
files
)
{
var
compiled
=
_
.
template
(
'<tr class="modal-asset>'
+
'<td><span class="modal-asset new"></span></td>'
+
'<td><p class="modal-asset name"> <%= file.name %></td>'
+
'</tr>'
);
var
html
=
''
;
for
(
var
i
=
0
;
i
<
files
.
length
;
i
++
)
{
html
+=
compiled
({
file
:
files
[
i
]});
}
return
html
;
}
function
showFileSelectionMenu
(
e
)
{
function
showFileSelectionMenu
(
e
)
{
e
.
preventDefault
();
e
.
preventDefault
();
$
(
'.file-input'
).
click
();
$
(
'.file-input'
).
click
();
...
@@ -69,11 +105,6 @@ function startUpload(e) {
...
@@ -69,11 +105,6 @@ function startUpload(e) {
$
(
'.upload-modal h1'
).
html
(
gettext
(
'Uploading…'
));
$
(
'.upload-modal h1'
).
html
(
gettext
(
'Uploading…'
));
$
(
'.upload-modal .file-name'
).
html
(
files
[
0
].
name
);
$
(
'.upload-modal .file-name'
).
html
(
files
[
0
].
name
);
$
(
'.upload-modal .file-chooser'
).
ajaxSubmit
({
beforeSend
:
resetUploadBar
,
uploadProgress
:
showUploadFeedback
,
complete
:
displayFinishedUpload
});
$
(
'.upload-modal .choose-file-button'
).
hide
();
$
(
'.upload-modal .choose-file-button'
).
hide
();
$
(
'.upload-modal .progress-bar'
).
removeClass
(
'loaded'
).
show
();
$
(
'.upload-modal .progress-bar'
).
removeClass
(
'loaded'
).
show
();
}
}
...
@@ -84,18 +115,27 @@ function resetUploadBar() {
...
@@ -84,18 +115,27 @@ function resetUploadBar() {
$
(
'.upload-modal .progress-fill'
).
html
(
percentVal
);
$
(
'.upload-modal .progress-fill'
).
html
(
percentVal
);
}
}
function
showUploadFeedback
(
event
,
position
,
total
,
percentComplete
)
{
function
resetUploadModal
()
{
resetUploadBar
();
$
(
'.upload-modal .file-name'
).
html
(
''
);
$
(
'.upload-modal h1'
).
html
(
gettext
(
'Upload New File'
));
$
(
'.upload-modal .choose-file-button'
).
html
(
gettext
(
'Choose File'
));
$
(
'.upload-modal .embeddable-xml-input'
).
val
(
''
);
$
(
'.upload-modal .embeddable'
).
hide
();
hideModal
();
}
function
showUploadFeedback
(
event
,
percentComplete
)
{
var
percentVal
=
percentComplete
+
'%'
;
var
percentVal
=
percentComplete
+
'%'
;
$
(
'.upload-modal .progress-fill'
).
width
(
percentVal
);
$
(
'.upload-modal .progress-fill'
).
width
(
percentVal
);
$
(
'.upload-modal .progress-fill'
).
html
(
percentVal
);
$
(
'.upload-modal .progress-fill'
).
html
(
percentVal
);
}
}
function
displayFinishedUpload
(
xhr
)
{
function
displayFinishedUpload
(
resp
)
{
if
(
xhr
.
status
==
200
)
{
if
(
resp
.
status
==
200
)
{
markAsLoaded
();
markAsLoaded
();
}
}
var
resp
=
JSON
.
parse
(
xhr
.
responseText
);
$
(
'.upload-modal .embeddable-xml-input'
).
val
(
resp
.
portable_url
);
$
(
'.upload-modal .embeddable-xml-input'
).
val
(
resp
.
portable_url
);
$
(
'.upload-modal .embeddable'
).
show
();
$
(
'.upload-modal .embeddable'
).
show
();
$
(
'.upload-modal .file-name'
).
hide
();
$
(
'.upload-modal .file-name'
).
hide
();
...
...
cms/templates/asset_index.html
View file @
e0ab75fb
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
<
%
block
name=
"jsextra"
>
<
%
block
name=
"jsextra"
>
<script
src=
"${static.url('js/vendor/mustache.js')}"
></script>
<script
src=
"${static.url('js/vendor/mustache.js')}"
></script>
<script
src=
"${static.url('js/vendor/jQuery-File-Upload/js/jquery.iframe-transport.js')}"
>
</script>
<script
src=
"${static.url('js/vendor/jQuery-File-Upload/js/jquery.fileupload.js')}"
>
</script>
</
%
block>
</
%
block>
<
%
block
name=
"content"
>
<
%
block
name=
"content"
>
...
@@ -128,7 +130,7 @@
...
@@ -128,7 +130,7 @@
<form
class=
"file-chooser"
action=
"${upload_asset_callback_url}"
<form
class=
"file-chooser"
action=
"${upload_asset_callback_url}"
method=
"post"
enctype=
"multipart/form-data"
>
method=
"post"
enctype=
"multipart/form-data"
>
<a
href=
"#"
class=
"choose-file-button"
>
Choose File
</a>
<a
href=
"#"
class=
"choose-file-button"
>
Choose File
</a>
<input
type=
"file"
class=
"file-input"
name=
"file"
>
<input
type=
"file"
class=
"file-input"
name=
"files[]"
multiple
>
</form>
</form>
</div>
</div>
</div>
</div>
...
...
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