Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
d85d4906
Commit
d85d4906
authored
Mar 21, 2016
by
marc
Browse files
database.js : allow 2 files per upload form
parent
f8b9a6d1
Changes
1
Hide whitespace changes
Inline
Side-by-side
browser/js/database.js
View file @
d85d4906
...
...
@@ -433,19 +433,38 @@ Database.prototype = {
success
:
function
(
result
)
{
var
js
=
self
.
display_result
(
result
)
if
(
typeof
js
.
file_id
!=
'
undefined
'
){
$
(
this
).
attr
(
"
action
"
,
"
0
"
)
var
id
=
js
.
file_id
var
fileSelect
=
document
.
getElementById
(
'
upload_file
'
);
var
files
=
fileSelect
.
files
;
var
data
=
new
FormData
();
$
(
this
).
attr
(
"
action
"
,
"
0
"
)
var
id
=
js
.
file_id
if
(
document
.
getElementById
(
"
upload_file
"
).
files
.
length
!=
0
){
var
fileSelect
=
document
.
getElementById
(
'
upload_file
'
);
var
files
=
fileSelect
.
files
;
var
data
=
new
FormData
();
for
(
var
i
=
0
;
i
<
files
.
length
;
i
++
)
{
var
file
=
files
[
i
];
data
.
append
(
'
file
'
,
file
,
file
.
name
);
}
data
.
append
(
'
id
'
,
id
);
data
.
append
(
'
file_number
'
,
1
)
data
.
append
(
'
pre_process
'
,
document
.
getElementById
(
'
pre_process
'
).
value
)
var
filename
=
$
(
'
#filename
'
).
val
()
self
.
uploader
.
add
(
id
,
data
,
filename
,
1
)
}
for
(
var
i
=
0
;
i
<
files
.
length
;
i
++
)
{
var
file
=
files
[
i
];
data
.
append
(
'
file
'
,
file
,
file
.
name
);
if
(
document
.
getElementById
(
"
upload_file2
"
).
files
.
length
!=
0
){
var
fileSelect
=
document
.
getElementById
(
'
upload_file2
'
);
var
files
=
fileSelect
.
files
;
var
data2
=
new
FormData
();
for
(
var
i
=
0
;
i
<
files
.
length
;
i
++
)
{
var
file
=
files
[
i
];
data2
.
append
(
'
file
'
,
file
,
file
.
name
);
}
data2
.
append
(
'
id
'
,
id
);
data2
.
append
(
'
file_number
'
,
2
)
data2
.
append
(
'
pre_process
'
,
document
.
getElementById
(
'
pre_process
'
).
value
)
self
.
uploader
.
add
(
id
+
"
_2
"
,
data2
,
filename
,
2
)
}
data
.
append
(
'
id
'
,
id
);
var
filename
=
$
(
'
#filename
'
).
val
()
self
.
uploader
.
add
(
id
,
data
,
filename
)
}
},
error
:
function
(
request
,
status
,
error
)
{
...
...
@@ -968,7 +987,7 @@ function Uploader() {
Uploader
.
prototype
=
{
//add an upload to the queue
add
:
function
(
id
,
data
,
filename
)
{
add
:
function
(
id
,
data
,
filename
,
file_number
)
{
var
div_parent
=
$
(
"
#upload_summary_selector
"
).
children
()[
0
]
var
div
=
$
(
'
<div/>
'
).
appendTo
(
div_parent
);
...
...
@@ -976,6 +995,7 @@ Uploader.prototype = {
"
id
"
:
id
,
"
data
"
:
data
,
"
filename
"
:
filename
,
"
file_number
"
:
file_number
,
"
status
"
:
"
queued
"
,
"
percent
"
:
0
,
"
div
"
:
div
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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