From c63b87ea1d40744b91f3cdcc9be84c03902f95a8 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 14 Jul 2016 17:58:44 +0200 Subject: [PATCH] fix team admin translations --- app/organization/team/admin.py | 27 +++++++++++++++++++++++---- app/organization/team/models.py | 4 ++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/organization/team/admin.py b/app/organization/team/admin.py index c5b13fcc..38e39430 100644 --- a/app/organization/team/admin.py +++ b/app/organization/team/admin.py @@ -5,6 +5,25 @@ from mezzanine.core.admin import DisplayableAdmin, BaseDynamicInlineAdmin, BaseT from organization.team.models import * +class OrganizationAdmin(BaseTranslationModelAdmin): + + model = Organization + + +class DepartmentAdmin(BaseTranslationModelAdmin): + + model = Department + + +class TeamAdmin(BaseTranslationModelAdmin): + + model = Team + + +class ActivityAdmin(BaseTranslationModelAdmin): + + model = Activity + class ActivityInline(admin.StackedInline): @@ -23,9 +42,9 @@ class PersonAdminDisplayable(DisplayableAdmin): inlines = [ActivityInline,] -admin.site.register(Organization) +admin.site.register(Organization, OrganizationAdmin) admin.site.register(OrganizationType) -admin.site.register(Department) -admin.site.register(Team) +admin.site.register(Department, DepartmentAdmin) +admin.site.register(Team, TeamAdmin) admin.site.register(Person, PersonAdminDisplayable) -admin.site.register(Activity) +admin.site.register(Activity, ActivityAdmin) diff --git a/app/organization/team/models.py b/app/organization/team/models.py index 81ebb7f5..256dafc3 100644 --- a/app/organization/team/models.py +++ b/app/organization/team/models.py @@ -46,7 +46,7 @@ ALIGNMENT_CHOICES = (('left', _('left')), ('right', _('right'))) class Address(models.Model): """(Address description)""" - address = models.TextField(_('description'), blank=True) + address = models.TextField(_('address'), blank=True) postal_code = models.CharField(_('postal code'), max_length=16, blank=True) country = CountryField(_('country')) @@ -82,7 +82,7 @@ class Department(Named): organization = models.ForeignKey('Organization', verbose_name=_('organization')) url = models.URLField(_('URL'), max_length=512, blank=True) - weaving_class = models.CharField(_('weaving class'), max_length=64, blank=True) + weaving_css_class = models.CharField(_('weaving CSS class'), max_length=64, blank=True) def __unicode__(self): return self.name -- 2.39.5