From 085d8bf07ff84d30d37ddb19ae5a4009d3d6ee27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= Date: Wed, 15 Jun 2011 15:26:46 +0000 Subject: [PATCH] Fixed problem with column header being displayed on checkbox columns, and always disabling the select-cols menu entry for it --- phpgwapi/js/egw_action/egw_grid_columns.js | 2 +- phpgwapi/js/egw_action/egw_grid_view.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpgwapi/js/egw_action/egw_grid_columns.js b/phpgwapi/js/egw_action/egw_grid_columns.js index 56ced80b0b..34f38e282c 100644 --- a/phpgwapi/js/egw_action/egw_grid_columns.js +++ b/phpgwapi/js/egw_action/egw_grid_columns.js @@ -521,7 +521,7 @@ egwGridColumns.prototype.getColumnVisibilitySet = function() result[this.columns[i].id] = { "caption": this.columns[i].caption, "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 }; } diff --git a/phpgwapi/js/egw_action/egw_grid_view.js b/phpgwapi/js/egw_action/egw_grid_view.js index ae9639f521..58637e6b17 100644 --- a/phpgwapi/js/egw_action/egw_grid_view.js +++ b/phpgwapi/js/egw_action/egw_grid_view.js @@ -352,13 +352,13 @@ egwGridViewOuter.prototype.buildBaseHeader = function() }); 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) { var sortArrow = $(document.createElement("span"));