Skip to content

Commit 1907d99

Browse files
committed
[FIX] don't proceed to import if have missing lang
1 parent dd4cf23 commit 1907d99

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

spp_area_base/models/area_import.py

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,21 @@ def parse_excel_to_json(self):
197197
# Create single job to parse Excel with pandas
198198
job = self.delayable(channel=_area_import_channel)._scan_and_create_parse_jobs()
199199
# After parsing, import the data
200-
job.on_done(self.delayable(channel=_area_import_channel).import_data())
200+
job.on_done(self.delayable(channel=_area_import_channel).after_parse())
201201
job.delay()
202+
203+
def after_parse(self):
204+
"""
205+
After parsing, import the data.
206+
"""
207+
self.ensure_one()
208+
with_missing_languages = self._validate_languages_activated()
209+
if with_missing_languages:
210+
self.locked = True
211+
self.locked_reason = with_missing_languages
212+
return
213+
self.import_data()
214+
202215

203216
def _scan_and_create_parse_jobs(self):
204217
"""
@@ -436,7 +449,9 @@ def _validate_languages_activated(self):
436449
error_message += _("Go to: Settings > Translations > Languages")
437450

438451
_logger.error("Area Import: Missing languages: %s", ", ".join(missing_languages))
439-
raise ValidationError(error_message)
452+
return error_message
453+
454+
return None
440455

441456
def _import_data_from_json(self, json_file_id):
442457
"""

spp_dms/tests/test_dms_directory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_action_spp_dms_directories_all_directory(self):
7070

7171
self.assertEqual(action["res_model"], "spp.dms.directory")
7272
self.assertEqual(action["target"], "current")
73-
self.assertEqual(action["view_mode"], "tree,form")
73+
self.assertEqual(action["view_mode"], "list,form")
7474
self.assertEqual(action["context"]["default_parent_id"], self.dms_directry_id.id)
7575
self.assertEqual(action["context"]["searchpanel_default_parent_id"], self.dms_directry_id.id)
7676
self.assertEqual(action["domain"], [("parent_id", "child_of", self.dms_directry_id.id)])
@@ -86,7 +86,7 @@ def test_action_spp_dms_files_all_directory(self):
8686

8787
self.assertEqual(action["res_model"], "spp.dms.file")
8888
self.assertEqual(action["target"], "current")
89-
self.assertEqual(action["view_mode"], "tree,form")
89+
self.assertEqual(action["view_mode"], "list,form")
9090
self.assertEqual(action["context"]["default_directory_id"], self.dms_directry_id.id)
9191
self.assertEqual(action["context"]["searchpanel_default_directory_id"], self.dms_directry_id.id)
9292
self.assertEqual(action["domain"], [("directory_id", "child_of", self.dms_directry_id.id)])

0 commit comments

Comments
 (0)