Fix: nome casa duplicado

2 months ago · 56c70c8729
2 changed files with 5 additions and 5 deletions
--- a/sapl/context_processors.py
+++ b/sapl/context_processors.py
@ -32,7 +32,7 @@ def google_recaptcha_configured(request):
    return {'google_recaptcha_configured': True}


-@cached_call("site-title", timeout=2 * 60)
+@cached_call("site-title", timeout=60 * 2)
 def enable_sapn(request):
    verbose_name = _('Sistema de Apoio ao Processo Legislativo') \
        if not sapn_is_enabled() \
@ -40,11 +40,11 @@ def enable_sapn(request):

    from sapl.base.models import CasaLegislativa
    casa_legislativa = CasaLegislativa.objects.first()
-    if casa_legislativa:
-        verbose_name = casa_legislativa.nome
+    nome_casa = casa_legislativa.nome if casa_legislativa and casa_legislativa.nome else ''

    return {
        'sapl_as_sapn': sapn_is_enabled(),
        'nome_sistema': verbose_name,
+        'nome_casa': nome_casa,
        'base_url': get_base_url(request),
    }
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@ -12,12 +12,12 @@

  <head>
    <meta charset="utf-8">
-    <title>{% block head_title %}{% switch "SAPLN_SWITCH" %}SAPL-Normas - {% else %}SAPL - {%endswitch%}{{nome_sistema}}{% endblock %}</title>
+    <title>{% block head_title %}{% switch "SAPLN_SWITCH" %}SAPL-Normas - {% else %}SAPL - {%endswitch%}{{nome_casa}}{% endblock %}</title>
    <script type="application/ld+json">
    {
      "@context" : "https://schema.org",
      "@type" : "WebSite",
-      "name" : "{{ nome_sistema }}",
+      "name" : "{{ nome_casa }}",
      "url" : "{{ base_url }}"
    }
  </script>