Projet

Général

Profil

0001-backoffice-rich-text-for-page-post-condition-error-m.patch

Corentin Séchet, 26 juin 2022 21:07

Télécharger (3,33 ko)

Voir les différences:

Subject: [PATCH] backoffice: rich text for page post condition error message
 (#65104)

 wcs/fields.py                        | 29 +++++++++++++++++++++-------
 wcs/qommon/static/css/dc2/admin.scss |  7 -------
 2 files changed, 22 insertions(+), 14 deletions(-)
wcs/fields.py
55 55
    JsonpSingleSelectWidget,
56 56
    MapMarkerSelectionWidget,
57 57
    MapWidget,
58
    MiniRichTextWidget,
58 59
    MultiSelectWidget,
59 60
    PasswordEntryWidget,
60 61
    RadiobuttonsWidget,
......
70 71
    VarnameWidget,
71 72
    WcsExtraStringWidget,
72 73
    WidgetList,
73
    WidgetListAsTable,
74 74
    WysiwygTextWidget,
75 75
)
76 76
from .qommon.misc import (
......
2733 2733
        if not value:
2734 2734
            value = {}
2735 2735
        self.add(
2736
            ConditionWidget, name='condition', title=_('Condition'), value=value.get('condition'), size=50
2736
            ConditionWidget,
2737
            name='condition',
2738
            title=_('Condition'),
2739
            value=value.get('condition'),
2740
            size=50,
2741
            render_br=False,
2737 2742
        )
2738 2743
        self.add(
2739
            StringWidget,
2744
            MiniRichTextWidget,
2740 2745
            name='error_message',
2741 2746
            title=_('Error message if condition is not met'),
2747
            render_br=False,
2742 2748
            value=value.get('error_message'),
2743
            size=50,
2744 2749
        )
2745 2750

  
2746 2751
    def _parse(self, request):
......
2750 2755
            self.value = None
2751 2756

  
2752 2757

  
2753
class PostConditionsTableWidget(WidgetListAsTable):
2758
class PostConditionsTableWidget(WidgetList):
2754 2759
    readonly = False
2755 2760

  
2756 2761
    def __init__(self, name, **kwargs):
2757
        super().__init__(name, element_type=PostConditionsRowWidget, **kwargs)
2762
        super().__init__(
2763
            name,
2764
            element_type=PostConditionsRowWidget,
2765
            add_element_label=_('Add condition'),
2766
            element_kwargs={
2767
                'render_br': False,
2768
            },
2769
            **kwargs,
2770
        )
2758 2771

  
2759 2772
    def parse(self, request=None):
2760 2773
        super().parse(request=request)
......
2893 2906
        form.add(
2894 2907
            PostConditionsTableWidget,
2895 2908
            'post_conditions',
2896
            title=_('Post Conditions'),
2897 2909
            value=self.post_conditions,
2898 2910
            advanced=True,
2899 2911
        )
......
2942 2954
        r += htmltext('</ul>')
2943 2955
        return r.getvalue()
2944 2956

  
2957
    def get_post_conditions_parameter_view_label(self):
2958
        return _('Post Conditions')
2959

  
2945 2960

  
2946 2961
register_field_class(PageField)
2947 2962

  
wcs/qommon/static/css/dc2/admin.scss
1105 1105
	height: 1.8em;
1106 1106
}
1107 1107

  
1108
.PostConditionsTableWidget td {
1109
	vertical-align: top;
1110
	input {
1111
		margin-top: 0;
1112
	}
1113
}
1114

  
1115 1108
ul#field-filter,
1116 1109
ul.columns-filter {
1117 1110
	list-style: none;
1118
-