0001-workflows-use-everybody-as-empty-label-for-message-c.patch

Frédéric Péters, 06 juillet 2021 15:16

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

Subject: [PATCH] workflows: use "everybody" as empty label for message/comment
 actions (#55410)

 wcs/qommon/form.py                  | 26 ++++++++++++++++++++++++++
 wcs/qommon/static/js/widget_list.js |  6 ++++++
 wcs/wf/register_comment.py          | 11 ++++-------
 wcs/workflows.py                    | 10 ++++------
 4 files changed, 40 insertions(+), 13 deletions(-)

             return r.getvalue()
     class WidgetListOfRoles(WidgetList):
         def __init__(self, name, value=None, roles=None, **kwargs):
             self.first_element_empty_label = kwargs.pop('first_element_empty_label', '---')
             super().__init__(
                 name,
                 value=value,
                 element_type=SingleSelectWidget,
                 element_kwargs={
                     'render_br': False,
                     'options': [(None, '---', None)] + roles or [],
                 },
                 **kwargs,
+            )
         def get_widgets(self):
             seen = False
             for widget in super().get_widgets():
                 # change first option (empty value) of first element to use a specific label
                 if not seen and isinstance(widget, SingleSelectWidget):
                     widget.full_options = widget.full_options[:]
                     widget.full_options[0] = list(widget.full_options[0])
                     widget.full_options[0][1] = self.first_element_empty_label
                     seen = True
                 yield widget
     class WidgetDict(quixote.form.widget.WidgetDict):
         # Fix the title and hint setting
         # FIXME: to be fixed in Quixote upstream : title and hint parameters should be removed

+                            }
+                        }
                     );
                     if (name_attr == 'to$add_element') {
                       /* replace 1st list element by an empty label, as it's used
                        * to remove an actual selection */
                       $(new_row).find('option[value="None"]').first().text('----');
+                    }
                     /* add new row after the last row */
                     $(row).after($(new_row));

+    )
     from ..qommon import _, ezt, get_logger
     from ..qommon.form import SingleSelectWidget, TextWidget, WidgetList
     from ..qommon.form import TextWidget, WidgetListOfRoles
     from ..qommon.template import TemplateError
-...
+                )
             if 'to' in parameters:
                 form.add(
                     WidgetList,
                     WidgetListOfRoles,
                     '%sto' % prefix,
                     title=_('To'),
                     element_type=SingleSelectWidget,
                     value=self.to or [],
                     add_element_label=self.get_add_role_label(),
                     element_kwargs={
                         'render_br': False,
                         'options': [(None, '---', None)] + self.get_list_of_roles(include_logged_in_users=False),
                     },
                     first_element_empty_label=_('Everybody'),
                     roles=self.get_list_of_roles(include_logged_in_users=False),
+                )
         def get_parameters(self):

         ValidatedStringWidget,
         VarnameWidget,
         WidgetList,
         WidgetListOfRoles,
         WysiwygTextWidget,
+    )
     from .qommon.humantime import seconds2humanduration
-...
+                )
             if 'to' in parameters:
                 form.add(
                     WidgetList,
                     WidgetListOfRoles,
                     '%sto' % prefix,
                     title=_('To'),
                     element_type=SingleSelectWidget,
                     value=self.to or [],
                     add_element_label=self.get_add_role_label(),
                     element_kwargs={
                         'render_br': False,
                         'options': [(None, '---', None)] + self.get_list_of_roles(include_logged_in_users=False),
                     },
                     first_element_empty_label=_('Everybody'),
                     roles=self.get_list_of_roles(include_logged_in_users=False),
+                )
         def get_parameters(self):
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-use-everybody-as-empty-label-for-message-c.patch