From 16992899d4451bc994ce4ae67bef6302fecf7654 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 14 Sep 2016 15:09:32 +0200 Subject: [PATCH] Let egw.link takes care of the base url. Fix sometimes nm_print_dialog template runs into CSP error --- api/js/etemplate/et2_extension_nextmatch.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js index d85f74d8fe..d79b6a9467 100644 --- a/api/js/etemplate/et2_extension_nextmatch.js +++ b/api/js/etemplate/et2_extension_nextmatch.js @@ -2243,14 +2243,12 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_ } },this); - var base_url = this.getInstanceManager().template_base_url; - if (base_url == '/') base_url = ''; // otherwise we generate a url //api/templates, which is wrong var dialog = et2_createWidget("dialog",{ // If you use a template, the second parameter will be the value of the template, as if it were submitted. callback: callback, // return false to prevent dialog closing buttons: et2_dialog.BUTTONS_OK_CANCEL, title: 'Print', - template:this.egw().link(base_url+'/api/templates/default/nm_print_dialog.xet'), + template:this.egw().link('/api/templates/default/nm_print_dialog.xet'), value: { content: { row_count: Math.min(100,total),