Commit e0847eb9 authored by Nasser Tijani's avatar Nasser Tijani Committed by Stefan Borchert
Browse files

Issue #3254384: anyLabel is set up even if there is only one element in the list

parent cc13d13f

js/views/WidgetView.js

+5 −3
Original line number Diff line number Diff line
@@ -95,9 +95,6 @@ 
      // Remove all existing options.

      $('option', widget.$el).remove();



      // Add "any" option.

      widget.$el.append($('<option>').text(widget.container.app.getSetting('anyLabel')).val(widget.container.app.getSetting('anyValue')));



      var defaultValue = widget.model.get('defaultValue');

      var defaultValueExistsOnOptions = false;
@@ -123,6 +120,11 @@ 
        widget.$el.append(option.render().$el);

      });



      // Add "any" option.

      if (widget.model.itemCollection.length > 1) {

        widget.$el.append($('<option>').text(widget.container.app.getSetting('anyLabel')).val(widget.container.app.getSetting('anyValue')));

      }



      var $container = $('.shs-widget-container[data-shs-level="' + widget.model.get('level') + '"]', widget.container.$el);

      if (widget.model.itemCollection.length === 0 && !widget.container.app.getSetting('create_new_levels')) {

        // Do not create the widget.