diff options
| author | Garren Smith <garren.smith@gmail.com> | 2013-09-19 16:47:31 +0200 |
|---|---|---|
| committer | suelockwood <deathbearbrown@gmail.com> | 2013-09-20 10:52:15 -0400 |
| commit | 8a1118e18790295f9094b16afe74d9f8a7fec479 (patch) | |
| tree | bee797a2e9bf543e0c3a562a31fa9126190bfa03 | |
| parent | faa65cd5021bc0a1e855571e9626fec647502cd7 (diff) | |
| download | couchdb-8a1118e18790295f9094b16afe74d9f8a7fec479.tar.gz | |
show upload errors
| -rw-r--r-- | src/fauxton/app/modules/documents/views.js | 9 | ||||
| -rw-r--r-- | src/fauxton/app/templates/documents/upload_modal.html | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js index de1938633..c70e94e19 100644 --- a/src/fauxton/app/modules/documents/views.js +++ b/src/fauxton/app/modules/documents/views.js @@ -147,6 +147,7 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, Codemirror, JSHint, re event.preventDefault(); var docRev = this.model.get('_rev'), + that = this, $form = this.$('#file-upload'); if (!docRev) { @@ -165,21 +166,23 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, Codemirror, JSHint, re beforeSend: this.beforeSend, uploadProgress: this.uploadProgress, success: this.success, - error: function () { - console.log('ERR on upload', arguments); + error: function (resp) { + console.log('ERR on upload', resp); + return that.set_error_msg('Could not upload document: ' + JSON.parse(resp.responseText).reason); } }); }, success: function (resp) { var hideModal = this.hideModal, - $form = this.$('#file-upload'); + $form = this.$('#file-upload'); FauxtonAPI.triggerRouteEvent('reRenderDoc'); //slight delay to make this transistion a little more fluid and less jumpy setTimeout(function () { $form.clearForm(); hideModal(); + $('.modal-backdrop').remove(); }, 1000); }, diff --git a/src/fauxton/app/templates/documents/upload_modal.html b/src/fauxton/app/templates/documents/upload_modal.html index 08a14a6b5..33c28617e 100644 --- a/src/fauxton/app/templates/documents/upload_modal.html +++ b/src/fauxton/app/templates/documents/upload_modal.html @@ -18,7 +18,7 @@ the License. <h3>Upload an Attachment</h3> </div> <div class="modal-body"> - <div id="modal-error" class="hide alert alert-error"/> + <div id="modal-error" class="alert alert-error hide" style="font-size: 16px;"> </div> <form id="file-upload" class="form" method="post"> <p class="help-block"> Please select the file you want to upload as an attachment to this document. |