mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
Some checking to make sure variables are there, and avoid errors
This commit is contained in:
parent
14bbfaafe7
commit
d58a3128e7
@ -1730,7 +1730,7 @@ var et2_nextmatch_customfields = et2_customfields_list.extend(et2_INextmatchHead
|
|||||||
|
|
||||||
// Check for global setting changes (visibility)
|
// Check for global setting changes (visibility)
|
||||||
var global_data = this.getArrayMgr("modifications").getRoot().getEntry('~custom_fields~');
|
var global_data = this.getArrayMgr("modifications").getRoot().getEntry('~custom_fields~');
|
||||||
if(global_data.fields) this.options.fields = global_data.fields;
|
if(global_data != null && global_data.fields) this.options.fields = global_data.fields;
|
||||||
|
|
||||||
var apps = egw.link_app_list();
|
var apps = egw.link_app_list();
|
||||||
for(var field_name in this.options.customfields)
|
for(var field_name in this.options.customfields)
|
||||||
@ -1846,7 +1846,7 @@ var et2_nextmatch_customfields = et2_customfields_list.extend(et2_INextmatchHead
|
|||||||
// Check for custom stuff (unlikely)
|
// Check for custom stuff (unlikely)
|
||||||
var data = this.getArrayMgr("modifications").getEntry(this.id);
|
var data = this.getArrayMgr("modifications").getEntry(this.id);
|
||||||
// Check for global settings
|
// Check for global settings
|
||||||
if(!data) data = this.getArrayMgr("modifications").getRoot().getEntry('~custom_fields~', true);
|
if(!data) data = this.getArrayMgr("modifications").getRoot().getEntry('~custom_fields~', true) || {};
|
||||||
if(!data.fields) data.fields = {};
|
if(!data.fields) data.fields = {};
|
||||||
for(var field in this.options.customfields)
|
for(var field in this.options.customfields)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user