Skip to content

Commit 9dd6a21

Browse files
committed
fix: remove django-floppyforms
1 parent 4b04f07 commit 9dd6a21

File tree

6 files changed

+6
-79
lines changed

6 files changed

+6
-79
lines changed

requirements/requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ dj-database-url==0.5.0
66
django-braces==1.14.0
77
django-crispy-forms==1.7.2
88
django-contrib-postgres==0.0.1
9-
django-floppyforms==1.8.0
109
django-extra-views==0.12.0
1110
django-model-utils==3.1.2
1211
django-extensions==2.1.4

sapl/parlamentares/forms.py

-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from django.utils import timezone
1414
from django.utils.translation import ugettext_lazy as _
1515
import django_filters
16-
from floppyforms.widgets import ClearableFileInput
1716
from image_cropping.widgets import CropWidget, ImageCropWidget
1817

1918
from sapl.base.models import Autor, TipoAutor
@@ -26,10 +25,6 @@
2625
Mandato, Parlamentar, Partido, Votante, Bloco, FrenteParlamentar, BlocoMembro)
2726

2827

29-
class ImageThumbnailFileInput(ClearableFileInput):
30-
template_name = 'floppyforms/image_thumbnail.html'
31-
32-
3328
class CustomImageCropWidget(ImageCropWidget):
3429
"""
3530
Custom ImageCropWidget that doesn't show the initial value of the field.

sapl/settings.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@
7575
'django.contrib.sessions',
7676
'django.contrib.messages',
7777
'django.contrib.staticfiles',
78+
'django.forms',
79+
7880
'django_extensions',
7981

8082
'crispy_forms',
81-
'floppyforms',
8283

8384
'waffle',
8485

@@ -197,6 +198,8 @@
197198

198199
ROOT_URLCONF = 'sapl.urls'
199200

201+
FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
202+
200203
TEMPLATES = [
201204
{
202205
'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -333,9 +336,6 @@
333336
CRISPY_TEMPLATE_PACK = 'bootstrap4'
334337
CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap4'
335338
CRISPY_FAIL_SILENTLY = not DEBUG
336-
FLOPPY_FORMS_USE_GIS = False
337-
338-
FORM_RENDERER = 'django.forms.renderers.DjangoTemplates'
339339

340340
# suprime texto de ajuda default do django-filter
341341
FILTERS_HELP_TEXT_FILTER = False

sapl/templates/floppyforms/image_thumbnail.html

-65
This file was deleted.

sapl/utils.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@
3131
from django.db.models import Q
3232
from django.db.models.fields.related import ForeignKey
3333
from django.forms import BaseForm
34-
from django.forms.widgets import SplitDateTimeWidget
34+
from django.forms.widgets import SplitDateTimeWidget, ClearableFileInput
3535
from django.http.response import JsonResponse, HttpResponse
3636
from django.utils import six, timezone
3737
from django.utils.safestring import mark_safe
3838
from django.utils.translation import ugettext_lazy as _
3939
import django_filters
4040
from easy_thumbnails import source_generators
41-
from floppyforms import ClearableFileInput
4241
import magic
4342
import requests
4443
from unipath.path import Path
@@ -310,7 +309,7 @@ def __init__(self, to, fields_search=(), **kwargs):
310309

311310

312311
class ImageThumbnailFileInput(ClearableFileInput):
313-
template_name = 'floppyforms/image_thumbnail.html'
312+
template_name = 'widgets/image_thumbnail.html'
314313

315314

316315
class RangeWidgetOverride(forms.MultiWidget):

setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
'dj-database-url==0.5.0',
1717
'django-braces==1.9.0',
1818
'django-crispy-forms==1.7.2',
19-
'django-floppyforms==1.7.0',
2019
'django-extra-views==0.12.0',
2120
'django-model-utils==3.1.2',
2221
'django-extensions==2.1.4',

0 commit comments

Comments
 (0)