summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-08-04 20:21:55 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-08-04 20:21:55 +0200
commit02e61229b2d2a2bbdf05e4595235945335c5ad05 (patch)
tree64f3249d549501235bc26a5d98920dc6ea07144f
parent016428a81db6b90ba2694059bca4b9cc593c7704 (diff)
downloadIshtar-02e61229b2d2a2bbdf05e4595235945335c5ad05.tar.bz2
Ishtar-02e61229b2d2a2bbdf05e4595235945335c5ad05.zip
Admin: prepopulate txt_idx with label
-rw-r--r--ishtar_common/admin.py1
-rw-r--r--ishtar_common/models.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 90f3067e3..c5166b3f2 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -220,6 +220,7 @@ class GeneralTypeAdmin(admin.ModelAdmin):
list_display = ['label', 'txt_idx', 'available', 'comment']
search_fields = ('label', 'txt_idx', 'comment',)
actions = ['import_generic', export_as_csv_action()]
+ prepopulated_fields = {"txt_idx": ("label",)}
import_generic = gen_import_generic
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 5afde8ffb..131f08323 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -422,7 +422,11 @@ class GeneralType(Cached, models.Model):
label = models.CharField(_(u"Label"), max_length=100)
txt_idx = models.CharField(
_(u"Textual ID"), validators=[validate_slug], max_length=100,
- unique=True)
+ unique=True,
+ help_text=_(
+ u"The slug is the standardized version of the name. It contains "
+ u"only lowercase letters, numbers and hyphens. Each slug must "
+ u"be unique."))
comment = models.TextField(_(u"Comment"), blank=True, null=True)
available = models.BooleanField(_(u"Available"), default=True)
HELP_TEXT = u""