extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 12:30:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some more adjustments to get disabled attribute into nextmatch unparsed

Browse Source
This commit is contained in:
nathangray 2016-05-30 17:50:16 -06:00
parent 772b97e22d
commit a5d4400918
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/js/etemplate/et2_widget_grid.js
View File

@ -108,9 +108,7 @@ var et2_grid = (function(){ "use strict"; return et2_DOMWidget.extend([et2_IDeta
for (var x = 0; x < w; x++)
{
// Some columns (nm) we do not parse into a boolean
var col_disabled = typeof _colData[x].disabled == 'boolean' ?
_colData[x].disabled :
this.getArrayMgr("content").parseBoolExpression(_colData[x].disabled);
var col_disabled = _colData[x].disabled;
cells[y][x] = {
"td": null,
"widget": null,
@ -466,7 +464,7 @@ var et2_grid = (function(){ "use strict"; return et2_DOMWidget.extend([et2_IDeta
}
// Create the element
if(!cell.disabled)
if(!cell.disabled || cell.disabled && typeof cell.disabled === 'string')
{
//Skip if it is a nextmatch while the nextmatch handles row adjustment by itself
if(!nm)
@ -487,8 +485,14 @@ var et2_grid = (function(){ "use strict"; return et2_DOMWidget.extend([et2_IDeta
}
}
var widget = this.createElementFromNode(node, nodeName);
if(!nm && typeof cell.disabled === 'string')
{
cell.disabled = this.getArrayMgr("content").parseBoolExpression(cell.disabled);
}
if(nm || !cell.disabled)
{
var widget = this.createElementFromNode(node, nodeName);
}
}
// Fill all cells the widget is spanning
@ -712,7 +716,7 @@ var et2_grid = (function(){ "use strict"; return et2_DOMWidget.extend([et2_IDeta
if (cell.disabled)
{
td.hide();
cell.widget.options = cell.disabled;
cell.widget.options.disabled = cell.disabled;
}
if (cell.width != "auto")