Projet

Général

Profil

0001-backoffice-show-type-and-varname-of-backoffice-field.patch

Thomas Noël, 27 septembre 2017 23:27

Télécharger (3,11 ko)

Voir les différences:

Subject: [PATCH] backoffice: show type and varname of backoffice fields
 (#19036)

 wcs/admin/workflows.py      | 10 ++++++++--
 wcs/wf/backoffice_fields.py |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)
wcs/admin/workflows.py
36 36
from qommon import get_logger
37 37

  
38 38
from wcs.workflows import *
39
from wcs.fields import get_field_types
39 40
from wcs.formdef import FormDef
40 41
from wcs.formdata import Evolution
41 42
from .fields import FieldDefPage, FieldsDirectory
......
1483 1484
                for field in self.workflow.backoffice_fields_formdef.fields:
1484 1485
                    r += htmltext('<li><a href="backoffice-fields/fields/%s/">%s') % (
1485 1486
                            field.id, field.label)
1487
                    try:
1488
                        type_label = [x[1] for x in get_field_types() if x[0] == field.type][0]
1489
                    except IndexError:
1490
                        type_label = _('Unknown')
1491
                    r += htmltext('<p class="details"><span class="type">%s</span>') % type_label
1486 1492
                    if field.varname:
1487
                        r += htmltext(' <code class="varname">[form_var_%s]</code>') % field.varname
1488
                    r += htmltext('</a></li>')
1493
                        r += htmltext(' - <span class="varname">[form_var_%s]</span>') % field.varname
1494
                    r += htmltext('</p></a></li>')
1489 1495
                r += htmltext('</ul>')
1490 1496
            r += htmltext('</div>')
1491 1497

  
wcs/wf/backoffice_fields.py
24 24
from qommon import evalutils
25 25
from qommon.form import (WidgetListAsTable, CompositeWidget, SingleSelectWidget,
26 26
        ComputedExpressionWidget, PicklableUpload)
27
from wcs.fields import WidgetField
27
from wcs.fields import WidgetField, get_field_types
28 28
from wcs.workflows import (WorkflowStatusItem,
29 29
        register_item_class, NamedAttachmentsSubstitutionProxy)
30 30
from wcs.wf.profile import FieldNode
......
40 40
        for field in workflow.get_backoffice_fields():
41 41
            if not issubclass(field.__class__, WidgetField):
42 42
                continue
43
            try:
44
                type_label = [x[1] for x in get_field_types() if x[0] == field.type][0]
45
            except IndexError:
46
                type_label = _('Unknown')
47
            label = '%s - %s' % (field.label, type_label)
43 48
            if field.varname:
44
                label = '%s [form_var_%s]' % (field.label, field.varname)
49
                label += ' - [form_var_%s]' % field.varname
45 50
            else:
46 51
                label = field.label
47 52
            fields.append((field.id, label, field.id))
48
-