arangodb
diff --git a/‎js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js
Lines changed: 15 additions & 13 deletions b/‎js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js
Lines changed: 15 additions & 13 deletions
diff --git a/‎js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js
Lines changed: 2 additions & 1 deletion b/‎js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js
Lines changed: 2 additions & 1 deletion
@@ -360,28 +360,30 @@
     },
 
     uploadDocuments: function (file, callback) {
+      var analyzeResponse = function (data) {
+        if (data.hasOwnProperty('error')) {
+          delete data.error;
+        }
+
+        if (data.errors > 0) {
+          callback(true, 'Info: ' + JSON.stringify(data));
+        } else {
+          callback(false, 'Info: ' + JSON.stringify(data));
+        }
+      };
+
       $.ajax({
         type: 'POST',
-        url: arangoHelper.databaseUrl('/_api/import?type=auto&collection=' +
+        url: arangoHelper.databaseUrl('/_api/import?type=auto&details=true&collection=' +
           encodeURIComponent(this.collectionID) +
           '&createCollection=false'),
         data: file,
         processData: false,
         contentType: 'json',
         dataType: 'json',
         complete: function (xhr) {
-          if (xhr.readyState === 4 && xhr.status === 201) {
-            callback(false);
-          } else {
-            try {
-              var data = JSON.parse(xhr.responseText);
-              if (data.errors > 0) {
-                var result = 'At least one error occurred during upload';
-                callback(false, result);
-              }
-            } catch (err) {
-              console.log(err);
-            }
+          if (xhr.responseJSON) {
+            analyzeResponse(xhr.responseJSON);
           }
         },
         error: function (msg) {
 
@@ -220,7 +220,7 @@
       $('#documents_first').css('visibility', 'visible');
       this.addDocumentSwitch = true;
       this.collection.resetFilter();
-      this.collection.loadTotal(callback);
+      this.collection.loadCollectionConfig(callback);
       this.restoredFilters = [];
 
       // for resetting json upload
@@ -249,6 +249,7 @@
         if (error) {
           arangoHelper.arangoError('Upload', msg);
         } else {
+          arangoHelper.arangoMessage('Upload', msg);
           this.hideImportModal();
           this.resetView();
         }