Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
307
Merge Requests
307
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
6e381483
Commit
6e381483
authored
Oct 05, 2012
by
webchick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#1798104
by zuuperman: Fixed Default value widget settings broken by WidgetPlugins.
parent
80505246
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
4 deletions
+46
-4
core/modules/field/field.info.inc
core/modules/field/field.info.inc
+1
-1
core/modules/field/lib/Drupal/field/Plugin/Type/LegacyDiscoveryDecorator.php
...lib/Drupal/field/Plugin/Type/LegacyDiscoveryDecorator.php
+4
-1
core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php
...b/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php
+1
-0
core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php
core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php
+1
-0
core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetNoDefault.php
...eld_test/Plugin/field/widget/TestFieldWidgetNoDefault.php
+30
-0
core/modules/field_ui/field_ui.admin.inc
core/modules/field_ui/field_ui.admin.inc
+2
-2
core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
...s/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
+7
-0
No files found.
core/modules/field/field.info.inc
View file @
6e381483
...
...
@@ -194,7 +194,7 @@ function _field_info_collate_types_reset() {
*/
function
field_behaviors_widget
(
$op
,
$instance
)
{
$info
=
field_info_widget_types
(
$instance
[
'widget'
][
'type'
]);
return
isset
(
$info
[
'behaviors'
][
$op
])
?
$info
[
'behaviors'
]
[
$op
]
:
FIELD_BEHAVIOR_DEFAULT
;
return
isset
(
$info
[
$op
])
?
$info
[
$op
]
:
FIELD_BEHAVIOR_DEFAULT
;
}
/**
...
...
core/modules/field/lib/Drupal/field/Plugin/Type/LegacyDiscoveryDecorator.php
View file @
6e381483
...
...
@@ -66,7 +66,10 @@ public function getDefinitions() {
$definition
[
'multiple_values'
]
=
$definition
[
'behaviors'
][
'multiple values'
];
unset
(
$definition
[
'behaviors'
][
'multiple values'
]);
}
if
(
isset
(
$definition
[
'behaviors'
][
'default value'
]))
{
$definition
[
'default_value'
]
=
$definition
[
'behaviors'
][
'default value'
];
unset
(
$definition
[
'behaviors'
][
'default value'
]);
}
$definitions
[
$plugin_id
]
=
$definition
;
}
}
...
...
core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php
View file @
6e381483
...
...
@@ -23,6 +23,7 @@ class WidgetPluginManager extends PluginManagerBase {
protected
$defaults
=
array
(
'settings'
=>
array
(),
'multiple_values'
=>
FALSE
,
'default_value'
=>
TRUE
,
);
/**
...
...
core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php
View file @
6e381483
...
...
@@ -209,6 +209,7 @@ function testInstancePrepare() {
$this
->
assertIdentical
(
$display
[
'type'
],
$field_type
[
'default_formatter'
],
t
(
"Formatter is set for the 'default' view mode"
));
$formatter_type
=
field_info_formatter_types
(
$display
[
'type'
]);
$this
->
assertIdentical
(
$display
[
'settings'
],
$formatter_type
[
'settings'
]
,
t
(
"Formatter settings are set for the 'default' view mode"
));
}
/**
...
...
core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetNoDefault.php
0 → 100644
View file @
6e381483
<?php
/**
* @file
* Definition of Drupal\field_test\Plugin\field\widget\TestFieldWidgetNoDefault.
*/
namespace
Drupal\field_test\Plugin\field\widget
;
use
Drupal\Core\Annotation\Plugin
;
use
Drupal\Core\Annotation\Translation
;
use
Drupal\field\Plugin\Type\Widget\WidgetBase
;
/**
* Plugin implementation of the 'test_field_widget_no_default' widget.
*
* @Plugin(
* id = "test_field_widget_no_default",
* module = "field_test",
* label = @Translation("Test widget - no default"),
* field_types = {
* "test_field"
* },
* settings = {
* "test_widget_setting_multiple" = "dummy test string"
* },
* default_value = FALSE
* )
*/
class
TestFieldWidgetNoDefault
extends
TestFieldWidget
{}
core/modules/field_ui/field_ui.admin.inc
View file @
6e381483
...
...
@@ -1944,7 +1944,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
$form
[
'instance'
][
'widget'
][
'settings'
]
=
$additions
?
$additions
:
array
(
'#type'
=>
'value'
,
'#value'
=>
array
());
// Add handling for default value if not provided by any other module.
if
(
field_behaviors_widget
(
'default
value'
,
$instance
)
==
FIELD_BEHAVIOR_DEFAULT
&&
empty
(
$instance
[
'default_value_function'
]))
{
if
(
field_behaviors_widget
(
'default
_
value'
,
$instance
)
==
FIELD_BEHAVIOR_DEFAULT
&&
empty
(
$instance
[
'default_value_function'
]))
{
$form
[
'instance'
][
'default_value_widget'
]
=
field_ui_default_value_widget
(
$field
,
$instance
,
$form
,
$form_state
);
}
...
...
@@ -1968,7 +1968,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
// Build the configurable field values.
$description
=
t
(
'Maximum number of values users can enter for this field.'
);
if
(
field_behaviors_widget
(
'multiple
values'
,
$instance
)
==
FIELD_BEHAVIOR_DEFAULT
)
{
if
(
field_behaviors_widget
(
'multiple
_
values'
,
$instance
)
==
FIELD_BEHAVIOR_DEFAULT
)
{
$description
.
=
'<br/>'
.
t
(
"'Unlimited' will provide an 'Add more' button so the users can add as many values as they like."
);
}
$form
[
'field'
][
'cardinality'
]
=
array
(
...
...
core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
View file @
6e381483
...
...
@@ -231,6 +231,13 @@ function testDefaultValue() {
field_info_cache_clear
();
$instance
=
field_info_instance
(
'node'
,
$field_name
,
$this
->
type
);
$this
->
assertEqual
(
$instance
[
'default_value'
],
NULL
,
'The default value was correctly saved.'
);
// Change the widget to TestFieldWidgetNoDefault.
$instance
[
'widget'
][
'type'
]
=
'test_field_widget_no_default'
;
field_update_instance
(
$instance
);
$this
->
drupalGet
(
$admin_path
);
$this
->
assertNoFieldById
(
$element_id
,
''
,
t
(
'No default value was possible for widget that disables default value.'
));
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment