Projet

Général

Profil

Révision 6eb8d15f

Ajouté par Assos Assos il y a presque 10 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/views/handlers/views_handler_filter.inc
91 91
    }
92 92

  
93 93
    if ($this->multiple_exposed_input()) {
94
      $this->group_info = array_filter($options['group_info']['default_group_multiple']);
94
      $this->group_info = NULL;
95
      if (!empty($options['group_info']['default_group_multiple'])) {
96
        $this->group_info = array_filter($options['group_info']['default_group_multiple']);
97
      }
98

  
95 99
      $this->options['expose']['multiple'] = TRUE;
96 100
    }
97 101

  
......
116 120
        'label' => array('default' => '', 'translatable' => TRUE),
117 121
        'description' => array('default' => '', 'translatable' => TRUE),
118 122
        'use_operator' => array('default' => FALSE, 'bool' => TRUE),
123
        'operator_label' => array('default' => '', 'translatable' => TRUE),
119 124
        'operator' => array('default' => ''),
120 125
        'identifier' => array('default' => ''),
121 126
        'required' => array('default' => FALSE, 'bool' => TRUE),
......
510 515
        '#description' => t('Allow the user to choose the operator.'),
511 516
        '#default_value' => !empty($this->options['expose']['use_operator']),
512 517
      );
518
      $form['expose']['operator_label'] = array(
519
        '#type' => 'textfield',
520
        '#default_value' => $this->options['expose']['operator_label'],
521
        '#title' => t('Operator label'),
522
        '#size' => 40,
523
        '#description' => t('This will appear before your operator select field.'),
524
        '#dependency' => array(
525
          'edit-options-expose-use-operator' => array(1)
526
        ),
527
      );
513 528
      $form['expose']['operator_id'] = array(
514 529
        '#type' => 'textfield',
515 530
        '#default_value' => $this->options['expose']['operator_id'],
......
754 769
      $operator = $this->options['expose']['operator_id'];
755 770
      $this->operator_form($form, $form_state);
756 771
      $form[$operator] = $form['operator'];
757

  
758
      if (isset($form[$operator]['#title'])) {
759
        unset($form[$operator]['#title']);
760
      }
772
      $form[$operator]['#title'] =  $this->options['expose']['operator_label'];
773
      $form[$operator]['#title_display'] = 'invisible';
761 774

  
762 775
      $this->exposed_translate($form[$operator], 'operator');
763 776

  

Formats disponibles : Unified diff