SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Adiciona metadados para Google crawler
continuous-integration/drone/push Build is passing
Details

pull/3772/head
Edward Ribeiro 2 months ago
parent
d135e71e4e
commit
28f5c0a4bd
5 changed files with 57 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      sapl/base/forms.py
  2. 22
      sapl/context_processors.py
  3. 1
      sapl/settings.py
  4. 8
      sapl/templates/base.html
  5. 27
      sapl/utils.py

12
sapl/base/forms.py
View File

@ -40,7 +40,7 @@ from sapl.utils import (autor_label, autor_modal, ChoiceWithoutValidationField,
FilterOverridesMetaMixin, FileFieldCheckMixin, FilterOverridesMetaMixin, FileFieldCheckMixin,
ImageThumbnailFileInput, qs_override_django_filter, ImageThumbnailFileInput, qs_override_django_filter,
RANGE_ANOS, YES_NO_CHOICES, choice_tipos_normas, RANGE_ANOS, YES_NO_CHOICES, choice_tipos_normas,
GoogleRecapthaMixin, parlamentares_ativos, RANGE_MESES, is_weak_password) GoogleRecapthaMixin, parlamentares_ativos, RANGE_MESES, is_weak_password, delete_cached_entry)
from .models import AppConfig, CasaLegislativa from .models import AppConfig, CasaLegislativa
@ -921,13 +921,17 @@ class CasaLegislativaForm(FileFieldCheckMixin, ModelForm):
# chama __clean de FileFieldCheckMixin # chama __clean de FileFieldCheckMixin
# por estar em clean de campo # por estar em clean de campo
super(CasaLegislativaForm, self)._check() super(CasaLegislativaForm, self)._check()
logotipo = self.cleaned_data.get('logotipo') logotipo = self.cleaned_data.get('logotipo')
if logotipo: if logotipo and logotipo.size > MAX_IMAGE_UPLOAD_SIZE:
if logotipo.size > MAX_IMAGE_UPLOAD_SIZE:
raise ValidationError("Imagem muito grande. ( > 2MB )") raise ValidationError("Imagem muito grande. ( > 2MB )")
return logotipo return logotipo
def save(self, commit=True):
casa = super(CasaLegislativaForm, self).save(commit=commit)
delete_cached_entry("site-title")
return casa
class LoginForm(AuthenticationForm): class LoginForm(AuthenticationForm):
username = forms.CharField( username = forms.CharField(

22
sapl/context_processors.py
View File

@ -1,14 +1,13 @@
import logging import logging
from django.conf import settings
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from sapl.utils import google_recaptcha_configured as google_recaptcha_configured_utils, sapn_is_enabled from sapl.utils import google_recaptcha_configured as \
google_recaptcha_configured_utils, sapn_is_enabled, cached_call, get_base_url
from sapl.utils import mail_service_configured as mail_service_configured_utils from sapl.utils import mail_service_configured as mail_service_configured_utils
def parliament_info(request): def parliament_info(request):
from sapl.base.views import get_casalegislativa from sapl.base.views import get_casalegislativa
casa = get_casalegislativa() casa = get_casalegislativa()
if casa: if casa:
@ -18,7 +17,6 @@ def parliament_info(request):
def mail_service_configured(request): def mail_service_configured(request):
if not mail_service_configured_utils(request): if not mail_service_configured_utils(request):
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.warning(_('Servidor de email não configurado.')) logger.warning(_('Servidor de email não configurado.'))
@ -27,7 +25,6 @@ def mail_service_configured(request):
def google_recaptcha_configured(request): def google_recaptcha_configured(request):
if not google_recaptcha_configured_utils(): if not google_recaptcha_configured_utils():
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.warning(_('Google Recaptcha não configurado.')) logger.warning(_('Google Recaptcha não configurado.'))
@ -35,10 +32,19 @@ def google_recaptcha_configured(request):
return {'google_recaptcha_configured': True} return {'google_recaptcha_configured': True}
@cached_call("site-title", timeout=2 * 60)
def enable_sapn(request): def enable_sapn(request):
verbose_name = _('Sistema de Apoio ao Processo Legislativo') \
if not sapn_is_enabled() \
else _('Sistema de Apoio à Publicação de Leis e Normas')
from sapl.base.models import CasaLegislativa
casa_legislativa = CasaLegislativa.objects.first()
if casa_legislativa:
verbose_name = casa_legislativa.nome
return { return {
'sapl_as_sapn': sapn_is_enabled(), 'sapl_as_sapn': sapn_is_enabled(),
'nome_sistema': _('Sistema de Apoio ao Processo Legislativo') 'nome_sistema': verbose_name,
if not sapn_is_enabled() 'base_url': get_base_url(request),
else _('Sistema de Apoio à Publicação de Leis e Normas')
} }

1
sapl/settings.py
View File

@ -194,6 +194,7 @@ CACHES = {
'default': { 'default': {
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
'LOCATION': '/var/tmp/django_cache', 'LOCATION': '/var/tmp/django_cache',
'OPTIONS': {"MAX_ENTRIES": 1000},
} }
} }

8
sapl/templates/base.html
View File

@ -13,6 +13,14 @@
<head> <head>
<meta charset="utf-8"> <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_sistema}}{% endblock %}</title>
<script type="application/ld+json">
{
"@context" : "https://schema.org",
"@type" : "WebSite",
"name" : "{{ nome_sistema }}",
"url" : "{{ base_url }}"
}
</script>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="theme-color" content="#343a40"> <meta name="theme-color" content="#343a40">

27
sapl/utils.py
View File

@ -23,6 +23,7 @@ from django.conf import settings
from django.contrib import admin from django.contrib import admin
from django.contrib.contenttypes.fields import (GenericForeignKey, GenericRel, from django.contrib.contenttypes.fields import (GenericForeignKey, GenericRel,
GenericRelation) GenericRelation)
from django.core.cache import cache
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.files.storage import FileSystemStorage from django.core.files.storage import FileSystemStorage
from django.core.files.uploadedfile import UploadedFile, InMemoryUploadedFile, \ from django.core.files.uploadedfile import UploadedFile, InMemoryUploadedFile, \
@ -1093,13 +1094,31 @@ def timing(f):
ts = time() ts = time()
result = f(*args, **kw) result = f(*args, **kw)
te = time() te = time()
logger.info('funcao:%r args:[%r, %r] took: %2.4f sec' % logger.info('function:%r args:[%r, %r] took: %2.4f sec' %
(f.__name__, args, kw, te - ts)) (f.__name__, args, kw, te - ts))
return result return result
return wrap return wrap
def cached_call(key, timeout=300):
def cache_decorator(f):
@wraps(f)
def wrap(*args, **kw):
result = cache.get(key)
if not result:
result = f(*args, **kw)
cache.set(key, result, timeout)
return result
return wrap
return cache_decorator
def delete_cached_entry(key):
cache.delete(key)
@timing @timing
def lista_anexados(principal): def lista_anexados(principal):
from sapl.materia.models import MateriaLegislativa from sapl.materia.models import MateriaLegislativa
@ -1614,11 +1633,13 @@ class PautaMultiFormatOutputMixin(MultiFormatOutputMixin):
v[rc] = f'{v[rc]}\r\n{cell}' v[rc] = f'{v[rc]}\r\n{cell}'
data[mri] = dict( data[mri] = dict(
map(lambda i, j: (i[0], j if type(j) in [str, int, list] else str(j)), self.fields_report['json'][index], v)) map(lambda i, j: (i[0], j if type(j) in [str, int, list] else str(j)),
self.fields_report['json'][index], v))
json_metadata.update({item[0]: { json_metadata.update({item[0]: {
'headers': dict( 'headers': dict(
map(lambda i, j: (i[0], j), self.fields_report['json'][index], self._headers(self.fields_report['json'][index]))), map(lambda i, j: (i[0], j), self.fields_report['json'][index],
self._headers(self.fields_report['json'][index]))),
'results': data} 'results': data}
}) })
response = JsonResponse(json_metadata) response = JsonResponse(json_metadata)

Write Preview
Loading…
Cancel
Save