ColumnManager.js (tine20-2020.08.3) | : | ColumnManager.js (tine20-2020.08.4) | ||
---|---|---|---|---|
skipping to change at line 67 | skipping to change at line 67 | |||
var _ = window.lodash, | var _ = window.lodash, | |||
column = {}, | column = {}, | |||
recordClass = Tine.Tinebase.data.RecordMgr.get(appName, modelNam e), | recordClass = Tine.Tinebase.data.RecordMgr.get(appName, modelNam e), | |||
modelConfig = recordClass ? recordClass.getModelConfiguration() : null, | modelConfig = recordClass ? recordClass.getModelConfiguration() : null, | |||
fieldDefinition = _.get(modelConfig, 'fields.' + fieldName , {}) , | fieldDefinition = _.get(modelConfig, 'fields.' + fieldName , {}) , | |||
fieldType = fieldDefinition.type || 'string', | fieldType = fieldDefinition.type || 'string', | |||
app = Tine.Tinebase.appMgr.get(appName), | app = Tine.Tinebase.appMgr.get(appName), | |||
i18n = fieldDefinition.useGlobalTranslation ? window.i18n : app. i18n; | i18n = fieldDefinition.useGlobalTranslation ? window.i18n : app. i18n; | |||
if (fieldDefinition.type === 'virtual') { | if (fieldDefinition.type === 'virtual') { | |||
fieldDefinition = fieldDefinition.config; | fieldDefinition = fieldDefinition.config || {};; | |||
} | } | |||
// don't show multiple record fields | // don't show multiple record fields | |||
if (fieldDefinition.type == 'records') { | if (fieldDefinition.type == 'records') { | |||
return null; | return null; | |||
} | } | |||
// don't show parent property in dependency of an editDialog | // don't show parent property in dependency of an editDialog | |||
if (this.editDialog && fieldDefinition.hasOwnProperty('config') && f ieldDefinition.config.isParent) { | if (this.editDialog && fieldDefinition.hasOwnProperty('config') && f ieldDefinition.config.isParent) { | |||
return null; | return null; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |