holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed problem with column header being displayed on checkbox columns, and always disabling the select-cols menu entry for it

Browse Source
This commit is contained in:
Andreas Stöckel 2011-06-15 15:26:46 +00:00
parent 5bed43746f
commit 085d8bf07f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/js/egw_action/egw_grid_columns.js
View File

@ -521,7 +521,7 @@ egwGridColumns.prototype.getColumnVisibilitySet = function()
result[this.columns[i].id] = { result[this.columns[i].id] = {
"caption": this.columns[i].caption, "caption": this.columns[i].caption,
"enabled": (this.columns[i].visibility != EGW_COL_VISIBILITY_ALWAYS) && "enabled": (this.columns[i].visibility != EGW_COL_VISIBILITY_ALWAYS) &&
(this.columns[i].type == EGW_COL_TYPE_DEFAULT), (this.columns[i].type != EGW_COL_TYPE_NAME_ICON_FIXED),
"visible": this.columns[i].visibility != EGW_COL_VISIBILITY_INVISIBLE "visible": this.columns[i].visibility != EGW_COL_VISIBILITY_INVISIBLE
}; };
} }

10
phpgwapi/js/egw_action/egw_grid_view.js
View File

@ -352,13 +352,13 @@ egwGridViewOuter.prototype.buildBaseHeader = function()
}); });
cont.append(this.checkbox); cont.append(this.checkbox);
} else {
var caption = $(document.createElement("span"));
caption.html(col.caption);
cont.append(caption);
} }
var caption = $(document.createElement("span"));
caption.html(col.caption);
cont.append(caption);
if (col.type != EGW_COL_TYPE_CHECKBOX && col.sortable != EGW_COL_SORTABLE_NONE) if (col.type != EGW_COL_TYPE_CHECKBOX && col.sortable != EGW_COL_SORTABLE_NONE)
{ {
var sortArrow = $(document.createElement("span")); var sortArrow = $(document.createElement("span"));