Issue#2993: Fix problem when upload a 0-bytes file

stable
Jesús Espino 2015-07-01 10:03:36 +02:00
parent de253d7a2b
commit 16993004f2
1 changed files with 10 additions and 2 deletions

View File

@ -48,6 +48,8 @@ resourceProvider = ($rootScope, $config, $urls, $model, $repo, $auth, $q) ->
defered.reject(response)
return defered.promise
xhr = new XMLHttpRequest()
uploadProgress = (evt) =>
$rootScope.$apply =>
file.status = "in-progress"
@ -64,7 +66,14 @@ resourceProvider = ($rootScope, $config, $urls, $model, $repo, $auth, $q) ->
data = {}
model = $model.make_model(urlName, data)
defered.resolve(model)
if xhr.status >= 200 and xhr.status < 400
defered.resolve(model)
else
response = {
status: xhr.status,
data: {_error_message: JSON.parse(xhr.response)['attached_file']?[0]}
}
defered.reject(response)
uploadFailed = (evt) =>
$rootScope.$apply ->
@ -76,7 +85,6 @@ resourceProvider = ($rootScope, $config, $urls, $model, $repo, $auth, $q) ->
data.append("object_id", objectId)
data.append("attached_file", file)
xhr = new XMLHttpRequest()
xhr.upload.addEventListener("progress", uploadProgress, false)
xhr.addEventListener("load", uploadComplete, false)
xhr.addEventListener("error", uploadFailed, false)