mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-05-29 14:58:31 +08:00
commit fa31bfc181
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/form/dndupload.js
View File

@ -91,6 +91,7 @@ M.form_dndupload.init = function(Y, options) {
this.maxfiles = options.maxfiles;
this.maxbytes = options.maxbytes;
this.itemid = options.itemid;
this.author = options.author;
this.container = this.Y.one('#'+options.containerid);
if (options.filemanager) {
@ -452,6 +453,9 @@ M.form_dndupload.init = function(Y, options) {
formdata.append('sesskey', M.cfg.sesskey);
formdata.append('repo_id', this.repositoryid);
formdata.append('itemid', this.itemid);
if (this.author) {
formdata.append('author', this.author);
}
if (this.filemanager) { // Filepickers do not have folders
formdata.append('savepath', this.filemanager.currentpath);
}

1
lib/form/filemanager.js
View File

@ -963,6 +963,7 @@ M.form_filemanager.init = function(Y, options) {
filemanager: manager,
acceptedtypes: options.accepted_types,
clientid: options.client_id,
author: options.author,
maxfiles: options.maxfiles,
maxbytes: options.maxbytes,
itemid: options.itemid,

1
lib/form/filepicker.js
View File

@ -47,6 +47,7 @@ M.form_filepicker.init = function(Y, options) {
var dndoptions = {
clientid: options.client_id,
acceptedtypes: options.accepted_types,
author: options.author,
maxfiles: -1,
maxbytes: options.maxbytes,
itemid: options.itemid,