diff -r f9cd7d17430e -r 7f97d8cae72e src/pyams_content/component/paragraph/zmi/keynumber.py --- a/src/pyams_content/component/paragraph/zmi/keynumber.py Fri Jun 08 17:50:09 2018 +0200 +++ b/src/pyams_content/component/paragraph/zmi/keynumber.py Fri Jun 08 18:05:11 2018 +0200 @@ -220,25 +220,37 @@ return switch_element_visibility(request, IKeyNumberContainer) +@adapter_config(name='label', context=(IKeyNumberContainerTarget, IPyAMSLayer, KeyNumbersTable), provides=IColumn) +class KeyNumbersTableLabelColumn(I18nColumn, I18nAttrColumn): + """Key numbers table label column""" + + _header = _('key-number-label', default="Header") + attrName = 'label' + weight = 10 + + def getValue(self, obj): + return super(KeyNumbersTableLabelColumn, self).getValue(obj) or '--' + + @adapter_config(name='name', context=(IKeyNumberContainerTarget, IPyAMSLayer, KeyNumbersTable), provides=IColumn) class KeyNumbersTableNameColumn(I18nColumn, GetAttrColumn): """Key numbers table number column""" _header = _("Number") attrName = 'number' - weight = 10 + weight = 20 -@adapter_config(name='label', context=(IKeyNumberContainerTarget, IPyAMSLayer, KeyNumbersTable), provides=IColumn) -class KeyNumbersTableLabelColumn(I18nColumn, I18nAttrColumn): - """Key numbers table label column""" +@adapter_config(name='unit', context=(IKeyNumberContainerTarget, IPyAMSLayer, KeyNumbersTable), provides=IColumn) +class KeyNumbersTableUnitColumn(I18nColumn, I18nAttrColumn): + """Key numbers table unit column""" - _header = _('key-number-label', default="Header") - attrName = 'label' - weight = 20 + _header = _('key-number-unit', default="Unit") + attrName = 'unit' + weight = 30 def getValue(self, obj): - return super(KeyNumbersTableLabelColumn, self).getValue(obj) or '--' + return super(KeyNumbersTableUnitColumn, self).getValue(obj) or '--' @adapter_config(name='text', context=(IKeyNumberContainerTarget, IPyAMSLayer, KeyNumbersTable), provides=IColumn) @@ -247,7 +259,7 @@ _header = _("Associated text") attrName = 'text' - weight = 30 + weight = 40 def getValue(self, obj): return super(KeyNumbersTableTextColumn, self).getValue(obj) or '--'