From 035ef0a9c734ba6f5f557c71498e866904a08e11 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 8 Jun 2016 16:56:45 -0600 Subject: [PATCH] Some more adjustments to get disabled attribute into nextmatch unparsed Fix some nextmatch columns did not show up in column selection --- api/js/etemplate/et2_widget_grid.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api/js/etemplate/et2_widget_grid.js b/api/js/etemplate/et2_widget_grid.js index fe07cca919..f79922e74a 100644 --- a/api/js/etemplate/et2_widget_grid.js +++ b/api/js/etemplate/et2_widget_grid.js @@ -800,7 +800,10 @@ var et2_grid = (function(){ "use strict"; return et2_DOMWidget.extend([et2_IDeta { if (this.managementArray[i].widget == _sender) { - vis = !(this.managementArray[i].disabled); + vis = !(typeof this.managementArray[i].disabled === 'boolean' ? + this.managementArray[i].disabled : + this.getArrayMgr("content").parseBoolExpression(this.managementArray[i].disabled) + ); break; } }