From aef80e1aec7ebbff867520d56bcf3dbaaf54e989 Mon Sep 17 00:00:00 2001 From: Mohamed Alsharaf Date: Tue, 13 Nov 2018 16:37:51 +1300 Subject: [PATCH] FIX: Prevent tmpl.js include on ajax request Including tmpl.js from the framework third party directory interfere with an upload field within a grid field edit form. --- code/GridFieldAddNewInlineButton.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/GridFieldAddNewInlineButton.php b/code/GridFieldAddNewInlineButton.php index 7fa0295..e8da8fc 100755 --- a/code/GridFieldAddNewInlineButton.php +++ b/code/GridFieldAddNewInlineButton.php @@ -67,7 +67,9 @@ class GridFieldAddNewInlineButton implements GridField_HTMLProvider, GridField_S throw new Exception('Inline adding requires the editable columns component'); } - Requirements::javascript(THIRDPARTY_DIR . '/javascript-templates/tmpl.js'); + if (!Director::is_ajax()) { + Requirements::javascript(THIRDPARTY_DIR . '/javascript-templates/tmpl.js'); + } GridFieldExtensions::include_requirements(); $data = new ArrayData(array(