Browse Source
Merge branch '3.1.x' into otimiza-normas-relacionadas
pull/3734/head
Edward
10 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
6 additions and
6 deletions
-
docker/docker-compose.yaml
-
sapl/norma/forms.py
-
sapl/settings.py
-
sapl/templates/base.html
-
setup.py
|
|
@ -32,7 +32,7 @@ services: |
|
|
|
networks: |
|
|
|
- sapl-net |
|
|
|
sapl: |
|
|
|
image: interlegis/sapl:3.1.163-RC21 |
|
|
|
image: interlegis/sapl:3.1.163-RC22 |
|
|
|
# build: |
|
|
|
# context: ../ |
|
|
|
# dockerfile: ./docker/Dockerfile |
|
|
|
|
|
@ -135,7 +135,7 @@ class NormaFilterSet(django_filters.FilterSet): |
|
|
|
) |
|
|
|
|
|
|
|
def filter_numero(self, queryset, name, value): |
|
|
|
p = r'[\W_]' |
|
|
|
p = r'(\W|_)' |
|
|
|
value = re.sub(p, '', value, flags=re.IGNORECASE) |
|
|
|
return queryset.annotate( |
|
|
|
numero_clean=Func( |
|
|
|
|
|
@ -30,7 +30,7 @@ BASE_DIR = Path(__file__).ancestor(1) |
|
|
|
PROJECT_DIR = Path(__file__).ancestor(2) |
|
|
|
|
|
|
|
# SECURITY WARNING: keep the secret key used in production secret! |
|
|
|
SECRET_KEY = config('SECRET_KEY', default='') |
|
|
|
SECRET_KEY = config('SECRET_KEY', default='32jk1h412l3kjh421lkj4hlkj234') |
|
|
|
# SECURITY WARNING: don't run with debug turned on in production! |
|
|
|
DEBUG = config('DEBUG', default=False, cast=bool) |
|
|
|
|
|
|
@ -41,7 +41,7 @@ ALLOWED_HOSTS = ['*'] |
|
|
|
LOGIN_REDIRECT_URL = '/' |
|
|
|
LOGIN_URL = '/login/?next=' |
|
|
|
|
|
|
|
SAPL_VERSION = '3.1.163-RC21' |
|
|
|
SAPL_VERSION = '3.1.163-RC22' |
|
|
|
|
|
|
|
if DEBUG: |
|
|
|
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' |
|
|
|
|
|
@ -192,7 +192,7 @@ |
|
|
|
<small> |
|
|
|
Desenvolvido pelo <a href="http://www.interlegis.leg.br/">Interlegis</a> em software livre e aberto. |
|
|
|
</small> |
|
|
|
<span>Release: 3.1.163-RC21</span> |
|
|
|
<span>Release: 3.1.163-RC22</span> |
|
|
|
</p> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
@ -38,7 +38,7 @@ install_requires = [ |
|
|
|
] |
|
|
|
setup( |
|
|
|
name='interlegis-sapl', |
|
|
|
version='3.1.163-RC21', |
|
|
|
version='3.1.163-RC22', |
|
|
|
packages=find_packages(), |
|
|
|
include_package_data=True, |
|
|
|
license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007', |
|
|
|