Projet

Général

Profil

Révision b720ea3e

Ajouté par Assos Assos il y a plus de 8 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/date/date_tools/date_tools.change_type.inc
28 28
  // Get the available date fields.
29 29
  foreach ($fields as $field_name => $field) {
30 30
    if ($field['type'] == 'date' || $field['type'] == 'datestamp' || $field['type'] == 'datetime') {
31
      $date_options[$labels[$field['type']]][$field_name] = t('Field @label (@field_name)', array('@label' => $field['widget']['label'], '@field_name' => $field_name, '@type' => $labels[$field['type']]));
31
      $date_options[$labels[$field['type']]][$field_name] = t('Field @label (@field_name)', array(
32
        '@label' => $field['widget']['label'],
33
        '@field_name' => $field_name,
34
        '@type' => $labels[$field['type']]
35
      ));
32 36
    }
33 37
  }
34
  if (sizeof($date_options) < 1) {
38
  if (count($date_options) < 1) {
35 39
    drupal_set_message(t('There are no date fields in this database.'));
36 40
    return $form;
37 41
  }
......
142 146
          case 'datestamp':
143 147
            $new_columns[] = $date_handler->sql_format('U', $db_field) . ' AS ' . $info['column'];
144 148
            break;
149

  
145 150
          case 'datetime':
146 151
            $new_columns[] = $date_handler->sql_format('Y-m-d H:i:s', $db_field) . ' AS ' . $info['column'];
147 152
            break;
148 153
        }
149 154
        break;
155

  
150 156
      case 'datestamp':
151 157
        switch ($new_type) {
152 158
          case 'date':
153 159
            $new_columns[] = $date_handler->sql_format('Y-m-d/TH:i:s', $db_field) . ' AS ' . $info['column'];
154 160
            break;
161

  
155 162
          case 'datetime':
156 163
            $new_columns[] = $date_handler->sql_format('Y-m-d H:i:s', $db_field) . ' AS ' . $info['column'];
157 164
            break;
158 165
        }
159 166
        break;
167

  
160 168
      case 'datetime':
161 169
        switch ($new_type) {
162 170
          case 'date':
163 171
            $new_columns[] = $date_handler->sql_format('Y-m-d/TH:i:s', $db_field) . ' AS ' . $info['column'];
164 172
            break;
173

  
165 174
          case 'datestamp':
166 175
            $new_columns[] = $date_handler->sql_format('U', $db_field) . ' AS ' . $info['column'];
167 176
            break;
......
178 187
  db_query($sql);
179 188
  db_query("DROP TABLE {" . $temp_table . "}");
180 189

  
181
  drupal_set_message(t('The field @field_name has been changed from @old_type to @new_type.', array('@field_name' => $field['widget']['label'], '@old_type' => $labels[$old_type], '@new_type' => $labels[$new_type])));
190
  drupal_set_message(t('The field @field_name has been changed from @old_type to @new_type.', array(
191
    '@field_name' => $field['widget']['label'],
192
    '@old_type' => $labels[$old_type],
193
    '@new_type' => $labels[$new_type]
194
  )));
182 195
}

Formats disponibles : Unified diff