@@ -437,13 +437,22 @@ function listmergeCsvPost(theFile){
// reload after 3s
setTimeout("location.reload(true)",3000);
},
error:function(result){
error:function(result,t){
if(t!='timeout'){
my_html='<h3 style="color:red">Error</h3>'
my_html+="<p class='note'>please correct your CSV file and retry</p>"
my_html+="<p>"+result.responseJSON['err']+"</p>"
}
else{
my_html='<h3 style="color:red">Timeout</h3>'
my_html+="<p>The CSV import timed out.</p>"
my_html+="<p>(This bug is currently being fixed. <br/>The import and indexation are now continuing in background on our servers. Results will show in a few minutes.)</p>"
<buttontype="button"class="btn btn-default {% if not state.complete %}hidden{% endif %}"data-container="body"data-toggle="popover"data-placement="bottom"data-trigger="focus"