updated core to 7.54
This commit is contained in:
@@ -11,8 +11,8 @@ dependencies[] = field_sql_storage
|
||||
required = TRUE
|
||||
stylesheets[all][] = theme/field.css
|
||||
|
||||
; Information added by Drupal.org packaging script on 2016-12-07
|
||||
version = "7.53"
|
||||
; Information added by Drupal.org packaging script on 2017-02-01
|
||||
version = "7.54"
|
||||
project = "drupal"
|
||||
datestamp = "1481152423"
|
||||
datestamp = "1485986921"
|
||||
|
||||
|
@@ -7,8 +7,8 @@ dependencies[] = field
|
||||
files[] = field_sql_storage.test
|
||||
required = TRUE
|
||||
|
||||
; Information added by Drupal.org packaging script on 2016-12-07
|
||||
version = "7.53"
|
||||
; Information added by Drupal.org packaging script on 2017-02-01
|
||||
version = "7.54"
|
||||
project = "drupal"
|
||||
datestamp = "1481152423"
|
||||
datestamp = "1485986921"
|
||||
|
||||
|
@@ -7,8 +7,8 @@ dependencies[] = field
|
||||
dependencies[] = options
|
||||
files[] = tests/list.test
|
||||
|
||||
; Information added by Drupal.org packaging script on 2016-12-07
|
||||
version = "7.53"
|
||||
; Information added by Drupal.org packaging script on 2017-02-01
|
||||
version = "7.54"
|
||||
project = "drupal"
|
||||
datestamp = "1481152423"
|
||||
datestamp = "1485986921"
|
||||
|
||||
|
@@ -5,8 +5,8 @@ package = Testing
|
||||
version = VERSION
|
||||
hidden = TRUE
|
||||
|
||||
; Information added by Drupal.org packaging script on 2016-12-07
|
||||
version = "7.53"
|
||||
; Information added by Drupal.org packaging script on 2017-02-01
|
||||
version = "7.54"
|
||||
project = "drupal"
|
||||
datestamp = "1481152423"
|
||||
datestamp = "1485986921"
|
||||
|
||||
|
@@ -6,8 +6,8 @@ core = 7.x
|
||||
dependencies[] = field
|
||||
files[] = number.test
|
||||
|
||||
; Information added by Drupal.org packaging script on 2016-12-07
|
||||
version = "7.53"
|
||||
; Information added by Drupal.org packaging script on 2017-02-01
|
||||
version = "7.54"
|
||||
project = "drupal"
|
||||
datestamp = "1481152423"
|
||||
datestamp = "1485986921"
|
||||
|
||||
|
@@ -164,6 +164,15 @@ function number_field_presave($entity_type, $entity, $field, $instance, $langcod
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($field['type'] == 'number_float') {
|
||||
// Remove the decimal point from float values with decimal
|
||||
// point but no decimal numbers.
|
||||
foreach ($items as $delta => $item) {
|
||||
if (isset($item['value'])) {
|
||||
$items[$delta]['value'] = floatval($item['value']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -152,4 +152,50 @@ class NumberFieldTestCase extends DrupalWebTestCase {
|
||||
);
|
||||
$this->drupalPost(NULL, $edit, t('Save'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test number_float field.
|
||||
*/
|
||||
function testNumberFloatField() {
|
||||
$this->field = array(
|
||||
'field_name' => drupal_strtolower($this->randomName()),
|
||||
'type' => 'number_float',
|
||||
'settings' => array(
|
||||
'precision' => 8, 'scale' => 4, 'decimal_separator' => '.',
|
||||
)
|
||||
);
|
||||
field_create_field($this->field);
|
||||
$this->instance = array(
|
||||
'field_name' => $this->field['field_name'],
|
||||
'entity_type' => 'test_entity',
|
||||
'bundle' => 'test_bundle',
|
||||
'widget' => array(
|
||||
'type' => 'number',
|
||||
),
|
||||
'display' => array(
|
||||
'default' => array(
|
||||
'type' => 'number_float',
|
||||
),
|
||||
),
|
||||
);
|
||||
field_create_instance($this->instance);
|
||||
|
||||
$langcode = LANGUAGE_NONE;
|
||||
$value = array(
|
||||
'9.' => '9',
|
||||
'.' => '0',
|
||||
'123.55' => '123.55',
|
||||
'.55' => '0.55',
|
||||
'-0.55' => '-0.55',
|
||||
);
|
||||
foreach($value as $key => $value) {
|
||||
$edit = array(
|
||||
"{$this->field['field_name']}[$langcode][0][value]" => $key,
|
||||
);
|
||||
$this->drupalPost('test-entity/add/test-bundle', $edit, t('Save'));
|
||||
$this->assertNoText("PDOException");
|
||||
$this->assertRaw($value, 'Correct value is displayed.');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -6,8 +6,8 @@ core = 7.x
|
||||
dependencies[] = field
|
||||
files[] = options.test
|
||||
|
||||
; Information added by Drupal.org packaging script on 2016-12-07
|
||||
version = "7.53"
|
||||
; Information added by Drupal.org packaging script on 2017-02-01
|
||||
version = "7.54"
|
||||
project = "drupal"
|
||||
datestamp = "1481152423"
|
||||
datestamp = "1485986921"
|
||||
|
||||
|
@@ -23,8 +23,15 @@ class OptionsWidgetsTestCase extends FieldTestCase {
|
||||
'type' => 'list_integer',
|
||||
'cardinality' => 1,
|
||||
'settings' => array(
|
||||
// Make sure that 0 works as an option.
|
||||
'allowed_values' => array(0 => 'Zero', 1 => 'One', 2 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>', 3 => 'Some HTML encoded markup with < & >'),
|
||||
'allowed_values' => array(
|
||||
// Make sure that 0 works as an option.
|
||||
0 => 'Zero',
|
||||
1 => 'One',
|
||||
// Make sure that option text is properly sanitized.
|
||||
2 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>',
|
||||
// Make sure that HTML entities in option text are not double-encoded.
|
||||
3 => 'Some HTML encoded markup with < & >',
|
||||
),
|
||||
),
|
||||
);
|
||||
$this->card_1 = field_create_field($this->card_1);
|
||||
@@ -35,8 +42,13 @@ class OptionsWidgetsTestCase extends FieldTestCase {
|
||||
'type' => 'list_integer',
|
||||
'cardinality' => 2,
|
||||
'settings' => array(
|
||||
// Make sure that 0 works as an option.
|
||||
'allowed_values' => array(0 => 'Zero', 1 => 'One', 2 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>'),
|
||||
'allowed_values' => array(
|
||||
// Make sure that 0 works as an option.
|
||||
0 => 'Zero',
|
||||
1 => 'One',
|
||||
// Make sure that option text is properly sanitized.
|
||||
2 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>',
|
||||
),
|
||||
),
|
||||
);
|
||||
$this->card_2 = field_create_field($this->card_2);
|
||||
@@ -47,8 +59,12 @@ class OptionsWidgetsTestCase extends FieldTestCase {
|
||||
'type' => 'list_boolean',
|
||||
'cardinality' => 1,
|
||||
'settings' => array(
|
||||
// Make sure that 0 works as a 'on' value'.
|
||||
'allowed_values' => array(1 => 'Zero', 0 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>'),
|
||||
'allowed_values' => array(
|
||||
// Make sure that 1 works as a 'on' value'.
|
||||
1 => 'Zero',
|
||||
// Make sure that option text is properly sanitized.
|
||||
0 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>',
|
||||
),
|
||||
),
|
||||
);
|
||||
$this->bool = field_create_field($this->bool);
|
||||
|
@@ -7,8 +7,8 @@ dependencies[] = field
|
||||
files[] = text.test
|
||||
required = TRUE
|
||||
|
||||
; Information added by Drupal.org packaging script on 2016-12-07
|
||||
version = "7.53"
|
||||
; Information added by Drupal.org packaging script on 2017-02-01
|
||||
version = "7.54"
|
||||
project = "drupal"
|
||||
datestamp = "1481152423"
|
||||
datestamp = "1485986921"
|
||||
|
||||
|
@@ -6,8 +6,8 @@ files[] = field_test.entity.inc
|
||||
version = VERSION
|
||||
hidden = TRUE
|
||||
|
||||
; Information added by Drupal.org packaging script on 2016-12-07
|
||||
version = "7.53"
|
||||
; Information added by Drupal.org packaging script on 2017-02-01
|
||||
version = "7.54"
|
||||
project = "drupal"
|
||||
datestamp = "1481152423"
|
||||
datestamp = "1485986921"
|
||||
|
||||
|
Reference in New Issue
Block a user