diff options
Diffstat (limited to 'ishtar_common/views_api.py')
| -rw-r--r-- | ishtar_common/views_api.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ishtar_common/views_api.py b/ishtar_common/views_api.py index fed1dc14e..c98f92dbb 100644 --- a/ishtar_common/views_api.py +++ b/ishtar_common/views_api.py @@ -35,6 +35,7 @@ from ishtar_common.views_item import get_item class ImporterTypeSerializer(serializers.ModelSerializer): + name = serializers.SerializerMethodField() model = serializers.SerializerMethodField() unicity_keys = serializers.SerializerMethodField() @@ -43,6 +44,13 @@ class ImporterTypeSerializer(serializers.ModelSerializer): fields = ['slug', 'name', 'description', 'is_import', 'is_template', 'model', 'unicity_keys'] + def get_name(self, obj): + name = "" + if obj.gis_type: + name = f"{obj.gis_type.label} | " + name += obj.name + return name + def get_model(self, obj): if not obj.associated_models: return "" @@ -114,10 +122,11 @@ class GISExportAPI(GISBaseImportView, GISAPIView): query = unquote_plus(request.GET["query"]) dct = {"query": query, "length": self.PAGE_LEN} if page > 1: - dct["start"] = (page - 1) * self.PAGE_LEN + 1 + dct["start"] = (page - 1) * self.PAGE_LEN try: importer_class = importer.get_importer_class() import_key = importer.get_gis_import_key() + geo_type = importer.gis_type.txt_idx cols, col_names = importer.get_columns(importer_class=importer_class) obj_name = importer_class.OBJECT_CLS.__name__.lower() return get_item(importer_class.OBJECT_CLS, "get_" + obj_name, obj_name, @@ -126,6 +135,7 @@ class GISExportAPI(GISBaseImportView, GISAPIView): no_link=True, col_names=col_names, col_types=importer.get_columns_types(), geo_import_key=import_key, + geo_type=geo_type, **dct ) except ImporterError as e: |