fixed: media missing from submissions in offline-capable views

s4parke · Dec 7, 2015 · cf5c3bf · cf5c3bf
1 parent 19dce3b
commit cf5c3bf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http:https://semver.org/).
 
-[Unreleased]
+[1.21.1] - 2015-12-07
 ---------------------
 ##### Changed
 - Show helpful "Use Safari on iOS" message when unsupported iOS browser is used.
-- Updated Dutch and Norwegian translations.
+- Updated Slovak, Dutch and Norwegian translations.
 
 ##### Fixed
 - Empty error dialog when form fails to load.
 - Form footer margins incorrect.
 - Media & data form resource retrieval does not work with "external authentication".
+- Media missing from submission in offline-capable views.
 
 ##### Removed
 - "Experimental" warning message

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
  "name": "enketo-express",
  "description": "A simplified version of Enketo Smart Paper that requires a constant connection to the server.",
  "homepage": "",
- "version": "1.21.0",
+ "version": "1.21.1",
  "main": "./app.js",
  "repository": {
  "type": "git",

diff --git a/public/js/src/module/connection.js b/public/js/src/module/connection.js
@@ -199,8 +199,8 @@ function _prepareFormDataArray( record ) {
  console.debug( 'splitting record into ' + batches.length + ' batches to reduce submission size ', batches );
 
  batches.forEach( function( batch ) {
- var batchPrepped,
-   fd = new FormData();
+ var batchPrepped;
+ var fd = new FormData();
 
  fd.append( 'xml_submission_file', xmlSubmissionBlob );
 
@@ -212,7 +212,7 @@ function _prepareFormDataArray( record ) {
 
  // add any media files to the batch
  batch.forEach( function( fileIndex ) {
- batchPrepped.formData.append( submissionFiles[ fileIndex ].nodeName, submissionFiles[ fileIndex ].file );
+ batchPrepped.formData.append( submissionFiles[ fileIndex ].nodeName, submissionFiles[ fileIndex ].file, submissionFiles[ fileIndex ].file.name );
  } );
 
  // push the batch to the array

diff --git a/public/js/src/module/records-queue.js b/public/js/src/module/records-queue.js
@@ -169,6 +169,10 @@ function uploadQueue() {
  .then( function( record ) {
  // convert record.files to a simple <File> array
  record.files = record.files.map( function( object ) {
+ // do not add name property if already has one (a File will throw exception)
+ if ( typeof object.item.name === 'undefined' ) {
+ object.item.name = object.name;
+ }
  return object.item;
  } );
  uploadProgress.update( record.instanceId, 'ongoing', '', successes.length + fails.length, records.length );

diff --git a/public/js/src/module/store.js b/public/js/src/module/store.js
@@ -666,7 +666,7 @@ function _getFile( table, id, key ) {
  return new Promise( function( resolve, reject ) {
  if ( table === 'resources' || table === 'files' ) {
  prop = ( table === 'resources' ) ? 'url' : 'name';
- server[ table ].get( id + ':' + key )
+ return server[ table ].get( id + ':' + key )
  .then( function( item ) {
  file[ prop ] = key;
  if ( item instanceof Blob ) {