svn path=/Website/trunk/; revision=51928
This commit is contained in:
2021-06-14 17:50:17 +00:00
parent f37bfc9965
commit 66e6ba3c98

View File

@@ -1022,7 +1022,7 @@ function scf_create_layout_list(model, p_params, p_fld_arr_all)
"buttons": [], "buttons": [],
"fields": fld_arr_layout "fields": fld_arr_layout
} }
if ("block" in p_params.layout && p_params.layout.block instanceof Array && p_params.layout.block.length > 0) if (p_params.layout && "block" in p_params.layout && p_params.layout.block instanceof Array && p_params.layout.block.length > 0)
{ {
if ("label" in p_params.layout.block[0]) if ("label" in p_params.layout.block[0])
layout_rest.label = p_params.layout.block[0].label; layout_rest.label = p_params.layout.block[0].label;
@@ -1077,14 +1077,14 @@ function scf_create_layout_list(model, p_params, p_fld_arr_all)
var rest_label = ""; var rest_label = "";
if (hasmulticolumn) if (hasmulticolumn)
{ {
if ("block" in p_params.layout && p_params.layout.block instanceof Array && p_params.layout.block.length > 1) if (p_params.layout && "block" in p_params.layout && p_params.layout.block instanceof Array && p_params.layout.block.length > 1)
{ {
if ("label" in p_params.layout.block[1]) if ("label" in p_params.layout.block[1])
rest_label = p_params.layout.block[1].label; rest_label = p_params.layout.block[1].label;
if ("icon" in p_params.layout.block[1]) if ("icon" in p_params.layout.block[1])
rest_icon = p_params.layout.block[1].icon; rest_icon = p_params.layout.block[1].icon;
} }
if (layout_rest.label === "") if (rest_label === "")
rest_label = (p_params.layout && p_params.layout.miscellaneous ? p_params.layout.miscellaneous : model.record_title) + " (2)"; rest_label = (p_params.layout && p_params.layout.miscellaneous ? p_params.layout.miscellaneous : model.record_title) + " (2)";
} }
else else