extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

skip empty, undefined or null labels when generating captions for column selection, eg. timesheet

Browse Source
This commit is contained in:
Ralf Becker 2014-01-31 08:14:49 +00:00
parent 06c0967ace
commit d383373ffe
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_extension_nextmatch.js
View File

@ -553,6 +553,8 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
/** /**
* Generates the column caption for the given column widget * Generates the column caption for the given column widget
*
* @param {et2_widget} _widget
*/ */
_genColumnCaption: function(_widget) { _genColumnCaption: function(_widget) {
var result = null; var result = null;
@ -561,6 +563,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
_widget.iterateOver(function(_widget) { _widget.iterateOver(function(_widget) {
var label = (_widget.options.label ? _widget.options.label : _widget.options.empty_label); var label = (_widget.options.label ? _widget.options.label : _widget.options.empty_label);
if (!label) return; // skip empty, undefined or null labels
if (!result) if (!result)
{ {
result = label; result = label;
@ -579,6 +582,8 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
* Used in preferences to refer to the columns by name instead of position * Used in preferences to refer to the columns by name instead of position
* *
* See _getColumnCaption() for human fiendly captions * See _getColumnCaption() for human fiendly captions
*
* @param {et2_widget} _widget
*/ */
_getColumnName: function(_widget) { _getColumnName: function(_widget) {
if(typeof _widget._getColumnName == 'function') return _widget._getColumnName(); if(typeof _widget._getColumnName == 'function') return _widget._getColumnName();