FieldManager.js (tine20-2020.08.3) | : | FieldManager.js (tine20-2020.08.4) | ||
---|---|---|---|---|
skipping to change at line 77 | skipping to change at line 77 | |||
return this.getByFieldDefinition(fieldDefinition, category, config); | return this.getByFieldDefinition(fieldDefinition, category, config); | |||
}, | }, | |||
getByFieldDefinition: function(fieldDefinition, category, config) { | getByFieldDefinition: function(fieldDefinition, category, config) { | |||
category = category || Tine.widgets.form.FieldManager.CATEGORY_EDITD IALOG; | category = category || Tine.widgets.form.FieldManager.CATEGORY_EDITD IALOG; | |||
config = config || {}; | config = config || {}; | |||
var field = {}, | var field = {}, | |||
fieldType = fieldDefinition.type || 'textfield', | fieldType = fieldDefinition.type || 'textfield', | |||
app = Tine.Tinebase.appMgr.get(fieldDefinition.appName), | app = Tine.Tinebase.appMgr.get(fieldDefinition.owningApp || fiel dDefinition.appName), | |||
i18n = fieldDefinition.useGlobalTranslation ? window.i18n : app. i18n; | i18n = fieldDefinition.useGlobalTranslation ? window.i18n : app. i18n; | |||
if (fieldType === 'virtual' && fieldDefinition.config) { | if (fieldType === 'virtual' && fieldDefinition.config) { | |||
fieldType = fieldDefinition.config.type || 'textfield'; | fieldType = fieldDefinition.config.type || 'textfield'; | |||
fieldDefinition = _.merge({}, fieldDefinition, fieldDefinition.c onfig); | fieldDefinition = _.merge({}, fieldDefinition, fieldDefinition.c onfig); | |||
} | } | |||
field.fieldLabel = i18n._hidden(fieldDefinition.label || fieldDefini tion.fieldName); | field.fieldLabel = i18n._hidden(fieldDefinition.label || fieldDefini tion.fieldName); | |||
field.name = fieldDefinition.fieldName || fieldDefinition.name; | field.name = fieldDefinition.fieldName || fieldDefinition.name; | |||
field.disabled = !! (fieldDefinition.readOnly || fieldDefinition.dis abled); | field.disabled = !! (fieldDefinition.readOnly || fieldDefinition.dis abled); | |||
skipping to change at line 122 | skipping to change at line 122 | |||
break; | break; | |||
case 'datetime': | case 'datetime': | |||
field.xtype = 'datetimefield'; // form ux.datetimefield | field.xtype = 'datetimefield'; // form ux.datetimefield | |||
break; | break; | |||
case 'bool': | case 'bool': | |||
case 'boolean': | case 'boolean': | |||
if (category === 'editDialog') { | if (category === 'editDialog') { | |||
field.xtype = 'checkbox'; | field.xtype = 'checkbox'; | |||
field.boxLabel = field.fieldLabel; | field.boxLabel = field.fieldLabel; | |||
field.hideLabel = true; | field.hideLabel = true; | |||
field.blurOnChange = true; | ||||
} else { | } else { | |||
field.xtype = 'booleancombo'; | field.xtype = 'booleancombo'; | |||
field.blurOnSelect = true; | ||||
} | } | |||
break; | break; | |||
case 'integer': | case 'integer': | |||
field.xtype = 'numberfield'; | field.xtype = 'numberfield'; | |||
field.allowDecimals = false; | field.allowDecimals = false; | |||
if (fieldDefinition.specialType && fieldDefinition.specialTy pe === 'percent') { | if (fieldDefinition.specialType && fieldDefinition.specialTy pe === 'percent') { | |||
field.xtype = 'extuxnumberfield'; | field.xtype = 'extuxnumberfield'; | |||
field.useThousandSeparator = false; | field.useThousandSeparator = false; | |||
field.suffix = ' %'; | field.suffix = ' %'; | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 3 lines changed or added |