Skip to content

Commit 1dc124e

Browse files
Merge pull request #2176 from IFRCGo/fix/no-rich-text-fr-summary
No rich text in FR summary
2 parents 85694a2 + 808b2af commit 1dc124e

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

api/admin.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from lang.admin import TranslationAdmin, TranslationInlineModelAdmin
2424
from notifications.models import RecordType, SubscriptionType
2525

26-
from .forms import ActionForm
26+
from .forms import ActionForm, SocietyNamePlain, SummaryPlain
2727

2828
# from reversion.models import Revision
2929

@@ -317,6 +317,8 @@ class FieldReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAd
317317
"countries",
318318
"districts",
319319
)
320+
form = SummaryPlain
321+
320322
readonly_fields = ("report_date", "created_at", "updated_at")
321323
list_filter = [MembershipFilter]
322324
actions = [
@@ -648,6 +650,7 @@ class CountryAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAd
648650
CountryICRCPresenceInline,
649651
]
650652
exclude = ("key_priorities",)
653+
form = SocietyNamePlain
651654

652655

653656
class RegionAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):

api/forms.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,23 @@ class ActionForm(forms.ModelForm):
1111
class Meta:
1212
model = Action
1313
fields = "__all__"
14+
15+
16+
class SocietyNamePlain(forms.ModelForm):
17+
class Meta:
18+
widgets = {
19+
"society_name_en": forms.Textarea(attrs={"class": "plain-textarea"}),
20+
"society_name_es": forms.Textarea(attrs={"class": "plain-textarea"}),
21+
"society_name_fr": forms.Textarea(attrs={"class": "plain-textarea"}),
22+
"society_name_ar": forms.Textarea(attrs={"class": "plain-textarea"}),
23+
}
24+
25+
26+
class SummaryPlain(forms.ModelForm):
27+
class Meta:
28+
widgets = {
29+
"summary_en": forms.Textarea(attrs={"class": "plain-textarea"}),
30+
"summary_es": forms.Textarea(attrs={"class": "plain-textarea"}),
31+
"summary_fr": forms.Textarea(attrs={"class": "plain-textarea"}),
32+
"summary_ar": forms.Textarea(attrs={"class": "plain-textarea"}),
33+
}

main/settings.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,17 +326,14 @@
326326
},
327327
]
328328

329+
# selector – exclude Geometry fields (bbox) and some plain textareas (see forms.py)
329330
TINYMCE_DEFAULT_CONFIG = {
331+
"selector": "textarea:not(.vWKTField):not(.plain-textarea)",
330332
"entity_encoding": "raw",
331333
"height": 360,
332334
"width": 1120,
333335
"cleanup_on_startup": True,
334336
"custom_undo_redo_levels": 20,
335-
"selector": "textarea:not(.vWKTField)"
336-
":not(.mt-field-society_name-en)"
337-
":not(.mt-field-society_name-es)"
338-
":not(.mt-field-society_name-fr)"
339-
":not(.mt-field-society_name-ar)",
340337
"plugins": '''
341338
anchor autolink charmap code codesample directionality
342339
fullscreen image insertdatetime link lists media

0 commit comments

Comments
 (0)