resolve conflict
This commit is contained in:
parent
b94fce27f8
commit
d590e42114
|
@ -226,7 +226,7 @@ class ImportForm(forms.Form):
|
||||||
data_pd = df.fillna('').to_dict()
|
data_pd = df.fillna('').to_dict()
|
||||||
|
|
||||||
if not data_pd or not df.last_valid_index():
|
if not data_pd or not df.last_valid_index():
|
||||||
self.exception("This file is empty!")
|
self.exception("The file you try to import is empty!")
|
||||||
|
|
||||||
if not self._schema:
|
if not self._schema:
|
||||||
return data
|
return data
|
||||||
|
|
Loading…
Reference in New Issue