From: Guillaume Pellerin Date: Mon, 5 Dec 2016 18:53:02 +0000 (+0100) Subject: Fix organization order, rename context variable (no caps plz!) X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=87c39b267a576d59c97f167f89dbe6f8f3c84926;p=mezzo.git Fix organization order, rename context variable (no caps plz!) --- diff --git a/app/organization/core/context_processors.py b/app/organization/core/context_processors.py index b5b3ad5e..684b776b 100644 --- a/app/organization/core/context_processors.py +++ b/app/organization/core/context_processors.py @@ -6,26 +6,26 @@ from organization.network.models import Organization def settings(request): date_now = datetime.now() # SEASON - CURRENT_SEASON = int(date_now.year) - 1 if datetime(date_now.year, 1,1) <= date_now and date_now <= datetime(date_now.year, 7, 31) else date_now.year - CURRENT_SEASON_STYLED = str(CURRENT_SEASON)[-2:]+"."+str(CURRENT_SEASON+1)[-2:] + current_season = int(date_now.year) - 1 if datetime(date_now.year, 1,1) <= date_now and date_now <= datetime(date_now.year, 7, 31) else date_now.year + current_season_styled = str(current_season)[-2:]+"."+str(current_season+1)[-2:] # NEWSLETTER newsletter_page = Page.objects.filter(slug="newsletter") - NEWSLETTER_SUBSCRIBING_URL = "" + newsletter_subscribing_url = "" if newsletter_page: - NEWSLETTER_SUBSCRIBING_URL = newsletter_page.first().get_absolute_url() + newsletter_subscribing_url = newsletter_page.first().get_absolute_url() # HOST ORGANIZATION - host_organization = Organization.objects.get(is_host=True) - linked_organizations_content = host_organization.organizations_content.filter(organizations_content__id=host_organization.id).order_by('organizations_content__order') - linked_organizations_footer = host_organization.organizations_footer.filter(organizations_footer__id=host_organization.id).order_by('organizations_footer__order') + host_org = Organization.objects.get(is_host=True) + linked_org_content = host_org.organizations_content.filter(organizations_content__id=host_org.id).order_by('organizations_content__order') + linked_org_footer = host_org.organizations_footer.filter(organizations_footer__id=host_org.id).order_by('organizations_footer__order') research_slug = "recherche" - return {'CURRENT_SEASON': CURRENT_SEASON, - 'CURRENT_SEASON_STYLED': CURRENT_SEASON_STYLED, - 'NEWSLETTER_SUBSCRIBING_URL': NEWSLETTER_SUBSCRIBING_URL, - 'host_organization': host_organization, - 'LINKED_ORGA_CONTENT' : linked_organizations_content, - 'LINKED_ORGA_FOOTER' : linked_organizations_footer, - 'RESEARCH_SLUG' : research_slug + return {'current_season': current_season, + 'current_season_styled': current_season_styled, + 'newsletter_subscribing_url': newsletter_subscribing_url, + 'host_organization': host_org, + 'linked_organization_content' : linked_org_content, + 'linked_organization_footer' : linked_org_footer, + 'research_slug' : research_slug } diff --git a/app/organization/network/models.py b/app/organization/network/models.py index a0231872..6d9111f5 100644 --- a/app/organization/network/models.py +++ b/app/organization/network/models.py @@ -73,8 +73,8 @@ class Organization(Named, Address, URL, AdminThumbRelatedMixin): telephone = models.CharField(_('telephone'), max_length=64, blank=True, null=True) opening_times = models.TextField(_('opening times'), blank=True) subway_access = models.TextField(_('subway access'), blank=True) - organizations_content = models.ManyToManyField('self', verbose_name=_('Linked organizations (in content)'), related_name='organization_main', blank=True, help_text="Usefull for host organization") - organizations_footer = models.ManyToManyField('self', verbose_name=_('Linked organizations (in footer)'), related_name='organization_main', blank=True, help_text="Usefull for host organization") + organizations_content = models.ManyToManyField('self', verbose_name=_('Linked organizations (in content)'), related_name='organizations_content', blank=True, help_text="Usefull for host organization") + organizations_footer = models.ManyToManyField('self', verbose_name=_('Linked organizations (in footer)'), related_name='organizations_footer', blank=True, help_text="Usefull for host organization") order = models.IntegerField(_('order number'), default=10) admin_thumb_type = 'logo' diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html index 7fc15a49..f64ee271 100644 --- a/app/templates/agenda/event_list.html +++ b/app/templates/agenda/event_list.html @@ -52,7 +52,7 @@ {% if tag and not tag|tag_is_excluded or not tag and not is_archive %}