From ab3099e7941937d84eb6bc885ab792f065a29cd2 Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Thu, 25 Feb 2016 09:35:22 +0000 Subject: [PATCH] FSN#35591: Lijst exporteren naar excel zonder kenmerken geeft extra text. svn path=/Website/trunk/; revision=28293 --- APPL/MLD/opdr_list.inc | 4 ++-- APPL/MLD/opdr_uren_list.inc | 4 ++-- APPL/PRJ/prj_list.inc | 4 ++-- APPL/PRS/prs_contactpersoon_list.inc | 4 ++-- APPL/PRS/prs_phonebook_list.asp | 4 ++-- APPL/RES/res_list_ppi.inc | 4 ++-- APPL/SLE/sle_list.inc | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/APPL/MLD/opdr_list.inc b/APPL/MLD/opdr_list.inc index d6158c1268..c1e6663b71 100644 --- a/APPL/MLD/opdr_list.inc +++ b/APPL/MLD/opdr_list.inc @@ -102,8 +102,8 @@ function opdr_list (params) // Voor resulttable de globalen zetten; zou ng anders moeten. var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc. - var print = (outputmode == 1); - var excel = (outputmode == 2); + var print = (outputmode == 1 || outputmode == 5); + var excel = (outputmode == 2 || outputmode == 6); var showall = params.showall; var mld_key = params.mld_key; diff --git a/APPL/MLD/opdr_uren_list.inc b/APPL/MLD/opdr_uren_list.inc index c7378563f8..e48ed5b7ca 100644 --- a/APPL/MLD/opdr_uren_list.inc +++ b/APPL/MLD/opdr_uren_list.inc @@ -31,8 +31,8 @@ function opdr_uren_list (pautfunction, params) // Voor resulttable de globalen zetten; zou ng anders moeten. var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc. - var print = (outputmode == 1); - var excel = (outputmode == 2); + var print = (outputmode == 1 || outputmode == 5); + var excel = (outputmode == 2 || outputmode == 6); var showall = params.showall; var handler_key = params.handler_key; diff --git a/APPL/PRJ/prj_list.inc b/APPL/PRJ/prj_list.inc index 6c65b033ec..f796c35599 100644 --- a/APPL/PRJ/prj_list.inc +++ b/APPL/PRJ/prj_list.inc @@ -43,8 +43,8 @@ function prj_list (pautfunction, params) // Voor resulttable de globalen zetten; zou ng anders moeten. var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc. - var print = (outputmode == 1); - var excel = (outputmode == 2); + var print = (outputmode == 1 || outputmode == 5); + var excel = (outputmode == 2 || outputmode == 6); var showall = params.showall; var scenario = params.scenario; diff --git a/APPL/PRS/prs_contactpersoon_list.inc b/APPL/PRS/prs_contactpersoon_list.inc index 4a439b4217..fba8220f32 100644 --- a/APPL/PRS/prs_contactpersoon_list.inc +++ b/APPL/PRS/prs_contactpersoon_list.inc @@ -46,8 +46,8 @@ function contactpersoon_list (params) // Voor resulttable de globalen zetten. var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc. - var print = (outputmode == 1); - var excel = (outputmode == 2); + var print = (outputmode == 1 || outputmode == 5); + var excel = (outputmode == 2 || outputmode == 6); var showall = params.showall; var intern = params.intern; diff --git a/APPL/PRS/prs_phonebook_list.asp b/APPL/PRS/prs_phonebook_list.asp index 3cf3f07cc9..256c76193f 100644 --- a/APPL/PRS/prs_phonebook_list.asp +++ b/APPL/PRS/prs_phonebook_list.asp @@ -462,7 +462,7 @@ var met_foto = getQParam("pb_photo","off")=="on"; rst.addColumn(new Column({caption: "", content: "prs_perslid_tussenvoegsel" })); rst.addColumn(new Column({caption: "", content: "prs_perslid_naam" })); } - if (outputmode==2 || outputmode==3) // XSL/ XML + if (outputmode==2 || outputmode==6 || outputmode==3) // XSL/ XML { rst.addColumn(new Column({caption: L("lcl_prs_person_geslacht"), content: fnGeslacht })); rst.addColumn(new Column({caption: L("lcl_prs_person_function"), content: "prs_srtperslid_omschrijving" })); @@ -483,7 +483,7 @@ var met_foto = getQParam("pb_photo","off")=="on"; if (S("prs_photo_kenmerk_key") > 0 && S("ph_rowdetails")!=1) rst.addColumn(new Column({caption: "", content: fnPhoto })); - if (S("ph_rowdetails") == 1 && (outputmode==0 || outputmode==1)) + if (S("ph_rowdetails") == 1 && (outputmode==0 || outputmode==1 || outputmode==5)) rst.addAction({action: "gotoProfiel", caption: L("lcl_edit"), isDefault: true}); if (S("prs_bulk_mail_max") > 0) rst.addAction({ action: "doMailing", caption: L("lcl_prs_mailing"), single: false, multi: true, multiOnce: true}); diff --git a/APPL/RES/res_list_ppi.inc b/APPL/RES/res_list_ppi.inc index 502e19b0ab..085e9ea525 100644 --- a/APPL/RES/res_list_ppi.inc +++ b/APPL/RES/res_list_ppi.inc @@ -72,8 +72,8 @@ function res_list_ppi(pautfunction, params) // Voor resulttable de globalen zetten; zou nog anders moeten. var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc. - var print = (outputmode == 1); - var excel = (outputmode == 2); + var print = (outputmode == 1 || outputmode == 5); + var excel = (outputmode == 2 || outputmode == 6); var formString = params.formString; var showall = params.showall; diff --git a/APPL/SLE/sle_list.inc b/APPL/SLE/sle_list.inc index da7b1b2ebc..369d2b5748 100644 --- a/APPL/SLE/sle_list.inc +++ b/APPL/SLE/sle_list.inc @@ -38,8 +38,8 @@ function sle_list (params) // Voor resulttable de globalen zetten; zou ng anders moeten. var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc. - var print = (outputmode == 1); - var excel = (outputmode == 2); + var print = (outputmode == 1 || outputmode == 5); + var excel = (outputmode == 2 || outputmode == 6); var showall = params.showall; var loc_key = params.loc_key;