diff --git a/api/admin.py b/api/admin.py index bbf448c3e..8dfa33a4e 100644 --- a/api/admin.py +++ b/api/admin.py @@ -23,7 +23,7 @@ from lang.admin import TranslationAdmin, TranslationInlineModelAdmin from notifications.models import RecordType, SubscriptionType -from .forms import ActionForm +from .forms import ActionForm, SocietyNamePlain, SummaryPlain # from reversion.models import Revision @@ -317,6 +317,8 @@ class FieldReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAd "countries", "districts", ) + form = SummaryPlain + readonly_fields = ("report_date", "created_at", "updated_at") list_filter = [MembershipFilter] actions = [ @@ -648,6 +650,7 @@ class CountryAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAd CountryICRCPresenceInline, ] exclude = ("key_priorities",) + form = SocietyNamePlain class RegionAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin): diff --git a/api/forms.py b/api/forms.py index 8394cc003..a69f6d84b 100644 --- a/api/forms.py +++ b/api/forms.py @@ -11,3 +11,23 @@ class ActionForm(forms.ModelForm): class Meta: model = Action fields = "__all__" + + +class SocietyNamePlain(forms.ModelForm): + class Meta: + widgets = { + "society_name_en": forms.Textarea(attrs={"class": "plain-textarea"}), + "society_name_es": forms.Textarea(attrs={"class": "plain-textarea"}), + "society_name_fr": forms.Textarea(attrs={"class": "plain-textarea"}), + "society_name_ar": forms.Textarea(attrs={"class": "plain-textarea"}), + } + + +class SummaryPlain(forms.ModelForm): + class Meta: + widgets = { + "summary_en": forms.Textarea(attrs={"class": "plain-textarea"}), + "summary_es": forms.Textarea(attrs={"class": "plain-textarea"}), + "summary_fr": forms.Textarea(attrs={"class": "plain-textarea"}), + "summary_ar": forms.Textarea(attrs={"class": "plain-textarea"}), + } diff --git a/main/settings.py b/main/settings.py index 9bb2a212e..1e93cf0ef 100644 --- a/main/settings.py +++ b/main/settings.py @@ -326,17 +326,14 @@ }, ] +# selector – exclude Geometry fields (bbox) and some plain textareas (see forms.py) TINYMCE_DEFAULT_CONFIG = { + "selector": "textarea:not(.vWKTField):not(.plain-textarea)", "entity_encoding": "raw", "height": 360, "width": 1120, "cleanup_on_startup": True, "custom_undo_redo_levels": 20, - "selector": "textarea:not(.vWKTField)" - ":not(.mt-field-society_name-en)" - ":not(.mt-field-society_name-es)" - ":not(.mt-field-society_name-fr)" - ":not(.mt-field-society_name-ar)", "plugins": ''' anchor autolink charmap code codesample directionality fullscreen image insertdatetime link lists media