From a4ac45c28516695b4db7ab71391da81ba29a5cda Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Thu, 21 Apr 2016 08:51:54 +0000 Subject: [PATCH] Iets robuustere code svn path=/Website/trunk/; revision=29100 --- APPL/SCF/scaffolding_search.inc | 2 +- APPL/SCF/scaffolding_show.inc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/APPL/SCF/scaffolding_search.inc b/APPL/SCF/scaffolding_search.inc index 87edfdf5c2..4bd7494a12 100644 --- a/APPL/SCF/scaffolding_search.inc +++ b/APPL/SCF/scaffolding_search.inc @@ -268,7 +268,7 @@ function scaffolding_search(model, scf_params) var field = model.fields[fld]; if (field.hidden || field.typ=="label") // Hidden kun je ook niet aanzetten, en labels idem. continue; - if (!field.label || field.label == '') + if (!field.label || field.label == '' || !field.dbs) continue; var on = inArray(fld, scf_params.list.columns); diff --git a/APPL/SCF/scaffolding_show.inc b/APPL/SCF/scaffolding_show.inc index 4ad0b36a85..1c992cbb1f 100644 --- a/APPL/SCF/scaffolding_show.inc +++ b/APPL/SCF/scaffolding_show.inc @@ -93,8 +93,10 @@ function scaffolding_show(model, scf_params) else __Log("Geen printknop want {0} is niet gevonden".format(xslfile)); - if (model.edit.modal) // het is dan vreemd dat we hier zijn. Expliciete showmode + if (model.edit.modal|| scf_params.edit && scf_params.edit.modal) + { // het is dan vreemd dat we hier zijn. Expliciete showmode buttons = []; // zoals fac_usrtab record vanuit materiaal. + } IFRAMER_HEADER(model.record_title, buttons); %>