diff options
| -rw-r--r-- | ishtar_common/admin.py | 5 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 6 | ||||
| -rw-r--r-- | ishtar_common/utils.py | 8 |
3 files changed, 16 insertions, 3 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 6b741c3c4..ab96dee8a 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -713,8 +713,9 @@ class ImportTargetInline(admin.TabularInline): class ImporterColumnAdmin(admin.ModelAdmin): - list_display = ('label', 'importer_type', 'col_number', 'description', - 'targets_lbl', 'duplicate_fields_lbl', 'required') + list_display = ('label', 'importer_type', 'col_number', 'col_string', + 'description', 'targets_lbl', 'duplicate_fields_lbl', + 'required') list_filter = ('importer_type',) inlines = (ImportTargetInline, ImporterDuplicateFieldInline) actions = [duplicate_importercolumn, shift_left, shift_right] diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 6b910a440..36e969276 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -41,7 +41,7 @@ from django.utils.translation import ugettext_lazy as _, pgettext_lazy from ishtar_common.utils import create_slug, \ get_all_related_m2m_objects_with_model, put_session_message, \ - put_session_var, get_session_var + put_session_var, get_session_var, num2col from ishtar_common.data_importer import Importer, ImportFormater, \ IntegerFormater, FloatFormater, UnicodeFormater, DateFormater, \ TypeFormater, YearFormater, StrToBoolean, FileFormater, InseeFormater @@ -378,6 +378,10 @@ class ImporterColumn(models.Model): def __unicode__(self): return u"{} - {}".format(self.importer_type, self.col_number) + @property + def col_string(self): + return num2col(self.col_number) + def natural_key(self): return self.importer_type.slug, self.col_number diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 8cb06aacb..1c64f7940 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -441,6 +441,14 @@ def get_all_related_objects(model): ] +def num2col(n): + string = "" + while n > 0: + n, remainder = divmod(n - 1, 26) + string = chr(65 + remainder) + string + return string + + def merge_tsvectors(vectors): """ Parse tsvector to merge them in one string |