0001-misc-allow-rich-text-in-comments-27994.patch

Frédéric Péters, 21 décembre 2021 15:24

Voir les différences: en ligne côte à côte

Subject: [PATCH] misc: allow "rich" text in comments (#27994)

 debian/control                                |  1 +
 tests/form_pages/test_all.py                  | 57 ++++++++++++++++++-
 tox.ini                                       |  1 +
 wcs/formdata.py                               |  8 +++
 wcs/formdef.py                                |  5 +-
 wcs/qommon/form.py                            | 12 ++++
 .../qommon/forms/widgets/mini-rich-text.html  | 10 ++++
 wcs/root.py                                   |  1 +
 wcs/variables.py                              |  5 +-
 wcs/workflows.py                              | 35 ++++++++++--
 10 files changed, 123 insertions(+), 12 deletions(-)
 create mode 100644 wcs/qommon/templates/qommon/forms/widgets/mini-rich-text.html

debian/control
31	31	python3-unidecode,
32	32	python3-uwsgidecorators,
33	33	python3-vobject,
	34	python3-xstatic-godo,
34	35	python3-xstatic-leaflet,
35	36	python3-xstatic-leaflet-gesturehandling,
36	37	uwsgi,

         assert 'form_comment' in resp.text  # makes sure user is treated as submitter
         resp.forms[0]['comment'] = 'hello world'
         resp = resp.forms[0].submit()
         assert formdef.data_class().get(formdata_id).evolution[-1].comment == 'hello world'
         assert formdef.data_class().get(formdata_id).evolution[-1].get_plain_text_comment() == 'hello world'
         # check we can also use it with lowercase letters.
         app = get_app(pub)
-...
         assert 'form_comment' in resp.text  # makes sure user is treated as submitter
         resp.forms[0]['comment'] = 'hello world'
         resp = resp.forms[0].submit()
         assert formdef.data_class().get(formdata_id).evolution[-1].comment == 'hello world'
         assert formdef.data_class().get(formdata_id).evolution[-1].get_plain_text_comment() == 'hello world'
         # and check we can also get back to it as anonymous
         app = get_app(pub)
-...
         resp.form['comment'] = 'plop'
         resp = resp.form.submit('button_x1').follow()
         assert '<p>plop</p>' in resp.text
         assert resp.pyquery('.comment').text() == 'plop'
         assert '<span class="status">Status2' in resp.text
         # no comment but no check
-...
         formdata.refresh_from_storage()
         assert not formdata.workflow_data
     def test_rich_commentable_action(pub):
         create_user(pub)
         formdef = create_formdef()
         formdef.data_class().wipe()
         formdef.roles = [logged_users_role().id]
         formdef.store()
         wf = Workflow(name='status')
         st1 = wf.add_status('Status1', 'st1')
         commentable = CommentableWorkflowStatusItem()
         commentable.id = '_commentable'
         commentable.by = [logged_users_role().id]
         commentable.required = True
         st1.items.append(commentable)
         commentable.parent = st1
         choice = ChoiceWorkflowStatusItem()
         choice.label = 'Submit'
         choice.by = [logged_users_role().id]
         choice.id = '_x1'
         choice.status = st1.id
         st1.items.append(choice)
         choice.parent = st1
         wf.store()
         formdef.workflow = wf
         formdef.store()
         # comment
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         resp = resp.form.submit('submit')  # -> validation page
         resp = resp.form.submit('submit')  # -> submission
         resp = resp.follow()
         resp.form['comment'] = '<p>hello <i>world</i></p>'
         resp = resp.form.submit('button_x1').follow()
         assert resp.pyquery('div.comment').text() == 'hello world'
         assert '<p>hello <i>world</i></p>' in resp.text
         formdata = formdef.data_class().select()[0]
         assert formdata.evolution[-1].parts[-1].comment == '<p>hello <i>world</i></p>'
         resp.form['comment'] = '<p>hello <script>evil</script></p>'
         resp = resp.form.submit('button_x1').follow()
         assert '<p>hello evil</p>' in resp.text
         formdata = formdef.data_class().select()[0]
         assert formdata.evolution[-1].parts[-1].comment == '<p>hello evil</p>'

tox.ini
36	36	docutils
37	37	langdetect
38	38	git+https://git.entrouvert.org/debian/django-ckeditor.git
	39	git+https://git.entrouvert.org/godo.js.git
39	40	django22: django>=2.2,<2.3
40	41	django-ratelimit<3
41	42	pyproj

             self._display_parts = l
             return self._display_parts
         def get_plain_text_comment(self):
             from .workflows import WorkflowCommentPart
             for part in reversed(self.parts or []):
                 if isinstance(part, WorkflowCommentPart):
                     return part.get_as_plain_text()
             return self.comment
         def get_json_export_dict(self, user, anonymise=False, include_files=True):
             data = {
                 'time': datetime.datetime(*self.time[:6]) if self.time else None,

             if evo.status:
                 details.append(_('Status'))
                 details.append('  %s' % formdata.get_status_label())
             if evo.comment:
                 details.append('\n%s\n' % evo.comment)
             comment = evo.get_plain_text_comment()
             if comment:
                 details.append('\n%s\n' % comment)
             return '\n\n----\n\n' + '\n'.join([str(x) for x in details])
         def is_of_concern_for_role_id(self, role_id):

                     tags=self.ALL_TAGS,
                     attributes=self.ALL_ATTRS,
                     styles=self.ALL_STYLES,
                     strip=True,
                     strip_comments=False,
+                )
                 if self.value.startswith('<br />'):
-...
+            )
     class MiniRichTextWidget(WysiwygTextWidget):
         template_name = 'qommon/forms/widgets/mini-rich-text.html'
         ALL_TAGS = ['p', 'b', 'strong', 'i', 'em']
         ALL_ATTRS = []
         ALL_STYLES = []
         def add_media(self):
             get_response().add_css_include('../xstatic/css/godo.css')
     class TableWidget(CompositeWidget):
         readonly = False

     {% extends "qommon/forms/widget.html" %}
     {% block widget-control %}
     <textarea style="display: none" id="form_{{widget.name}}" name="{{widget.name}}"
         {% for attr in widget.attrs.items %}{{attr.0}}="{{attr.1}}" {% endfor %}
         class="mini-rich-text">{{widget.value|default:""}}</textarea>
     <script type="module">
     import Godo from "/static/xstatic/js/godo.js";
     new Godo(document.getElementById('form_{{widget.name}}'), {schema: 'basic'});
     </script>
     {% endblock %}

wcs/root.py
195	195	'xstatic:jquery',
196	196	'xstatic:jquery_ui',
197	197	'xstatic:font_awesome',
	198	'xstatic:godo',
198	199	'xstatic:opensans',
199	200	'xstatic:leaflet',
200	201	'xstatic:leaflet_gesturehandling',

         @property
         def comment(self):
             if self._formdata.evolution and self._formdata.evolution[-1].comment:
                 return self._formdata.evolution[-1].comment
             if self._formdata.evolution:
                 latest_evolution = self._formdata.evolution[-1]
                 return latest_evolution.get_plain_text_comment() or latest_evolution.comment
             return ''
         @property

     import collections
     import copy
     import datetime
     import html
     import itertools
     import os
     import random
-...
     import xml.etree.ElementTree as ET
     from django.utils.encoding import force_text
     from django.utils.html import strip_tags
     from quixote import get_publisher, get_request, get_response
     from quixote.html import TemplateIO, htmltext
-...
         ComputedExpressionWidget,
         ConditionWidget,
         Form,
         MiniRichTextWidget,
         SingleSelectWidget,
         SingleSelectWidgetWithOther,
         StringWidget,
-...
             klass.init()
     class WorkflowCommentPart(EvolutionPart):
         def __init__(self, comment, varname=None):
             self.comment = comment
             self.varname = varname
         def get_as_plain_text(self):
             return html.unescape(strip_tags(self.comment))
         def view(self):
             return htmltext('<div class="comment">%s</div>' % self.comment)
     class CommentableWorkflowStatusItem(WorkflowStatusItem):
         description = _('Comment')
         key = 'commentable'
-...
                 else:
                     title = self.label
                 form.add(
                     TextWidget, 'comment', title=title, required=self.required, cols=40, rows=10, hint=self.hint
                     MiniRichTextWidget,
                     'comment',
                     title=title,
                     required=self.required,
                     cols=40,
                     rows=10,
                     hint=self.hint,
+                )
                 form.get_widget('comment').attrs['class'] = 'comment'
                 if self.button_label == 0:
-...
         def submit_form(self, form, formdata, user, evo):
             if form.get_widget('comment'):
                 evo.comment = form.get_widget('comment').parse()
                 if self.varname:
                     workflow_data = {'comment_%s' % self.varname: evo.comment}
                     formdata.update_workflow_data(workflow_data)
                 comment = form.get_widget('comment').parse()
                 if comment:
                     comment_part = WorkflowCommentPart(comment, varname=self.varname)
                     evo.add_part(comment_part)
                     if self.varname:
                         formdata.update_workflow_data(
                             {'comment_%s' % self.varname: comment_part.get_as_plain_text()}
+                        )
         def submit_admin_form(self, form):
             for f in self.get_parameters():
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-allow-rich-text-in-comments-27994.patch