diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-15 12:05:49 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-15 12:05:49 +0100 |
| commit | 58ac0c6435b3b2a53a72db2a3ff3fb12e081b3f3 (patch) | |
| tree | f3cbc672b80bf1d04ffdff4f101c6559f6aa2fc5 /chimere/models.py | |
| parent | c6a55de9267ea57e245c0f9a8485493178a27e6c (diff) | |
| download | Chimère-58ac0c6435b3b2a53a72db2a3ff3fb12e081b3f3.tar.bz2 Chimère-58ac0c6435b3b2a53a72db2a3ff3fb12e081b3f3.zip | |
UI: refactoring
Diffstat (limited to 'chimere/models.py')
| -rw-r--r-- | chimere/models.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/chimere/models.py b/chimere/models.py index 4ff6ab7..c4fa9b3 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -197,7 +197,8 @@ class Color(models.Model): help_text=_("HTML code/name"), blank=True, null=True) order = models.IntegerField(_("Order")) - color_theme = models.ForeignKey(ColorTheme, verbose_name=_("Color theme")) + color_theme = models.ForeignKey(ColorTheme, verbose_name=_("Color theme"), + related_name='colors') class Meta: ordering = ["order"] @@ -275,21 +276,27 @@ class SubCategory(models.Model): ('P', _('Polygon')), ('B', _('Both')),) item_type = models.CharField(_("Item type"), max_length=1, choices=TYPE) + order = models.IntegerField(_("Order"), default=1000) dated = models.BooleanField(_("Is dated"), default=False) description = models.TextField(blank=True, null=True) icon = models.ForeignKey(Icon, verbose_name=_("Icon")) hover_icon = models.ForeignKey( Icon, verbose_name=_("Hover icon"), blank=True, null=True, related_name='subcat_hovered') - color_theme = models.ForeignKey(ColorTheme, verbose_name=_("Color theme"), - blank=True, null=True, - related_name='subcategories') + menu_icon = models.ForeignKey( + Icon, verbose_name=_("Menu icon"), blank=True, null=True, + related_name='subcat_menu') + menu_icon_off = models.ForeignKey( + Icon, verbose_name=_("Menu icon off"), blank=True, null=True, + related_name='subcat_menu_off') + color_theme = models.ForeignKey( + ColorTheme, verbose_name=_("Color theme"), blank=True, null=True, + related_name='subcategories', help_text=_("For route and polygon")) as_layer = models.BooleanField(_("Displayed in the layer menu"), default=False) weight_formula = models.TextField(_("Weight formula"), default="", blank=True, null=True) routing_warn = models.BooleanField(_("Routing warn"), default=False) - order = models.IntegerField(_("Order"), default=1000) keywords = models.TextField(_("Keywords"), max_length=200, blank=True, null=True) min_zoom = models.IntegerField( @@ -1554,6 +1561,7 @@ class PictureFile(models.Model): class Meta: verbose_name = _("Picture file") verbose_name_plural = _("Picture files") + ordering = ['order'] def scale_image(max_x, pair): |