extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 09:38:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for HTML site/general configuration overwriting customfield settings

Browse Source
This commit is contained in:
Nathan Gray 2013-06-18 23:23:42 +00:00
parent 8a2c791be3
commit 1b3c8d15c8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/js/et2_extension_customfields.js
View File

@ -408,6 +408,12 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
if(options.length > 2) attrs.config.toolbarStartupExpanded = options[2]; if(options.length > 2) attrs.config.toolbarStartupExpanded = options[2];
} }
attrs.config.height = ((field.rows ? field.rows : 5) *16) +'px'; attrs.config.height = ((field.rows ? field.rows : 5) *16) +'px';
// We have to push the config modifications into the modifications array, or they'll
// be overwritten by the site config from the server
var data = this.getArrayMgr("modifications").getEntry(this.prefix+field_name);
if(data) jQuery.extend(data.config, attrs.config);
return true; return true;
}, },
_setup_radio: function(field_name, field, attrs) { _setup_radio: function(field_name, field, attrs) {