From e8f988f6dff12ebf846035438c8ff7fef848d785 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 2 Nov 2020 19:15:50 +0100 Subject: Import template: add description list - Simplify document import --- ishtar_common/models_imports.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'ishtar_common/models_imports.py') diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index e23e7cd56..0638bc8f4 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -37,6 +37,11 @@ from django.template.defaultfilters import slugify from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _, pgettext_lazy +try: + assert settings.USE_LIBREOFFICE + from ishtar_common.libreoffice import UnoCalc +except AssertionError: + UnoCalc = None from ishtar_common.model_managers import SlugModelManager from ishtar_common.utils import create_slug, \ @@ -152,6 +157,10 @@ class ImporterType(models.Model): cell.CharWeight = 150 cell.setString(column.label) + cell = main_sheet.getCellByPosition(col_number - 1, 1) + cell.CharWeight = 150 + cell.setString(column.description) + # only managing the first target... ft = None for target in column.targets.all(): @@ -174,7 +183,7 @@ class ImporterType(models.Model): end_row = uno.create_list(lst_sheet, lst_col_number, 0, str(model._meta.verbose_name), lst) uno.set_cell_validation_list( - main_sheet, col_number, 1, ROW_NUMBER + 1, + main_sheet, col_number, 2, ROW_NUMBER + 2, lst_sheet, lst_col_number, [1, end_row]) lst_col_number += 1 tmpdir = tempfile.mkdtemp(prefix="ishtar-templates-") -- cgit v1.2.3