Skip to content

Commit a11363a

Browse files
author
Olivier Giulieri
committed
Use "labellist" if "label" is empty.
1 parent fc27664 commit a11363a

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎dist/evolutility.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,7 +2981,7 @@ Evol.ViewAction.Export = Backbone.View.extend({
29812981
'<div>',EvoUI.input.checkbox('showID','1'), '<label for="showID">', i18nXpt.IDkey, '</label>','</div>'*/
29822982
);
29832983
_.each(fields, function(f, i){
2984-
var fLabel = f.labelexport || f.label,
2984+
var fLabel = f.labelexport || f.label || f.labellist,
29852985
fID = 'fx-' + f.id;
29862986
if (fLabel === null || fLabel === '') {
29872987
fLabel = '(' + fID + ')';
@@ -3679,7 +3679,7 @@ Evol.ViewAction.Filter = Backbone.View.extend({
36793679
h=['<select id="field" class="form-control"><option value=""></option>'];
36803680
for (var i=0,iMax=fields.length;i<iMax;i++){
36813681
var f=fields[i];
3682-
h.push(Evol.UI.input.option(f.id,f.label));
3682+
h.push(Evol.UI.input.option(f.id,f.label || f.labellist));
36833683
}
36843684
h.push('</select>');
36853685
this._fList=h.join('');

‎dist/evolutility.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/action-export.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Evol.ViewAction.Export = Backbone.View.extend({
6161
'<div>',EvoUI.input.checkbox('showID','1'), '<label for="showID">', i18nXpt.IDkey, '</label>','</div>'*/
6262
);
6363
_.each(fields, function(f, i){
64-
var fLabel = f.labelexport || f.label,
64+
var fLabel = f.labelexport || f.label || f.labellist,
6565
fID = 'fx-' + f.id;
6666
if (fLabel === null || fLabel === '') {
6767
fLabel = '(' + fID + ')';

‎js/action-filter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Evol.ViewAction.Filter = Backbone.View.extend({
286286
h=['<select id="field" class="form-control"><option value=""></option>'];
287287
for (var i=0,iMax=fields.length;i<iMax;i++){
288288
var f=fields[i];
289-
h.push(Evol.UI.input.option(f.id,f.label));
289+
h.push(Evol.UI.input.option(f.id,f.label || f.labellist));
290290
}
291291
h.push('</select>');
292292
this._fList=h.join('');

0 commit comments

Comments
 (0)