diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-11-01 13:17:12 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:19 +0100 |
| commit | ad0c40ca519ec3d81120744e6c511fb3d5992897 (patch) | |
| tree | 38b5b7a9b2dd3a6336bdc650758b26b476ab4292 | |
| parent | 9589747a947df6550729b6adae89618aa7839f4e (diff) | |
| download | Ishtar-ad0c40ca519ec3d81120744e6c511fb3d5992897.tar.bz2 Ishtar-ad0c40ca519ec3d81120744e6c511fb3d5992897.zip | |
Geodata - form: on creation default name field to associated item
| -rw-r--r-- | ishtar_common/forms_common.py | 4 | ||||
| -rw-r--r-- | ishtar_common/views.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index f0f29d0a0..399e8a8a3 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -2673,10 +2673,6 @@ class GISForm(forms.ModelForm, CustomForm, ManageOldType): "geo_field": FormHeader(_("Geography")), "buffer": FormHeader(_("Buffer"), collapse=True), } - OPTIONS_PERMISSIONS = [ - # field name, permission, options - ("tags", ("ishtar_common.add_documenttag",), {"new": True}), - ] GEO_FIELDS = ( ("point_2d",), diff --git a/ishtar_common/views.py b/ishtar_common/views.py index f7963c929..4cdbcf8c9 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -2892,6 +2892,8 @@ class GeoCreateView(GeoFormMixin, CreateView): kwargs["main_items_fields"][k] = [] if k.endswith(obj.SLUG): kwargs["initial"][k] = [obj.pk] + kwargs["initial"]["name"] = obj.short_label \ + if hasattr(obj, "short_label") else str(obj) key = f"{k}_{obj.pk}_main_item" kwargs["main_items_fields"][k].append( (key, "{} - {}".format(_("Main geo item for"), obj)) |