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
220
Merge Requests
220
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
57762d19
Commit
57762d19
authored
Sep 26, 2017
by
catch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2783615
by k4v, Dom., dawehner: Datetime FAPI element type do not allow AJAX via #ajax API
parent
e64d7536
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
130 additions
and
1 deletion
+130
-1
core/lib/Drupal/Core/Datetime/Element/Datetime.php
core/lib/Drupal/Core/Datetime/Element/Datetime.php
+20
-0
core/lib/Drupal/Core/Render/Element/Date.php
core/lib/Drupal/Core/Render/Element/Date.php
+4
-1
core/lib/Drupal/Core/Render/Element/RenderElement.php
core/lib/Drupal/Core/Render/Element/RenderElement.php
+2
-0
core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.routing.yml
...tests/modules/ajax_forms_test/ajax_forms_test.routing.yml
+8
-0
core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
...es/system/tests/modules/ajax_forms_test/src/Callbacks.php
+12
-0
core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestAjaxElementsForm.php
...jax_forms_test/src/Form/AjaxFormsTestAjaxElementsForm.php
+48
-0
core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxCallbacksTest.php
...upal/FunctionalJavascriptTests/Ajax/AjaxCallbacksTest.php
+36
-0
No files found.
core/lib/Drupal/Core/Datetime/Element/Datetime.php
View file @
57762d19
...
...
@@ -45,6 +45,7 @@ public function getInfo() {
],
'#process'
=>
[
[
$class
,
'processDatetime'
],
[
$class
,
'processAjaxForm'
],
[
$class
,
'processGroup'
],
],
'#pre_render'
=>
[
...
...
@@ -311,6 +312,25 @@ public static function processDatetime(&$element, FormStateInterface $form_state
return
$element
;
}
/**
* {@inheritdoc}
*/
public
static
function
processAjaxForm
(
&
$element
,
FormStateInterface
$form_state
,
&
$complete_form
)
{
$element
=
parent
::
processAjaxForm
(
$element
,
$form_state
,
$complete_form
);
// Copy the #ajax settings to the child elements.
if
(
isset
(
$element
[
'#ajax'
]))
{
if
(
isset
(
$element
[
'date'
]))
{
$element
[
'date'
][
'#ajax'
]
=
$element
[
'#ajax'
];
}
if
(
isset
(
$element
[
'time'
]))
{
$element
[
'time'
][
'#ajax'
]
=
$element
[
'#ajax'
];
}
}
return
$element
;
}
/**
* Validation callback for a datetime element.
*
...
...
core/lib/Drupal/Core/Render/Element/Date.php
View file @
57762d19
...
...
@@ -33,7 +33,10 @@ public function getInfo() {
return
[
'#input'
=>
TRUE
,
'#theme'
=>
'input__date'
,
'#process'
=>
[[
$class
,
'processDate'
]],
'#process'
=>
[
[
$class
,
'processAjaxForm'
],
[
$class
,
'processDate'
],
],
'#pre_render'
=>
[[
$class
,
'preRenderDate'
]],
'#theme_wrappers'
=>
[
'form_element'
],
'#attributes'
=>
[
'type'
=>
'date'
],
...
...
core/lib/Drupal/Core/Render/Element/RenderElement.php
View file @
57762d19
...
...
@@ -269,6 +269,7 @@ public static function preRenderAjaxForm($element) {
$element
[
'#attributes'
][
'data-disable-refocus'
]
=
"true"
;
}
// Add a reasonable default event handler if none was specified.
if
(
isset
(
$element
[
'#ajax'
])
&&
!
isset
(
$element
[
'#ajax'
][
'event'
]))
{
switch
(
$element
[
'#type'
])
{
...
...
@@ -308,6 +309,7 @@ public static function preRenderAjaxForm($element) {
case
'radio'
:
case
'checkbox'
:
case
'select'
:
case
'date'
:
$element
[
'#ajax'
][
'event'
]
=
'change'
;
break
;
...
...
core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.routing.yml
View file @
57762d19
...
...
@@ -38,3 +38,11 @@ ajax_forms_test.image_button_form:
requirements
:
_access
:
'
TRUE'
ajax_forms_test.ajax_element_form
:
path
:
'
/ajax_forms_test_ajax_element_form'
defaults
:
_title
:
'
AJAX
forms
elements
test'
_form
:
'
\Drupal\ajax_forms_test\Form\AjaxFormsTestAjaxElementsForm'
requirements
:
_access
:
'
TRUE'
core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
View file @
57762d19
...
...
@@ -22,6 +22,18 @@ public function selectCallback($form, FormStateInterface $form_state) {
return
$response
;
}
/**
* Ajax callback triggered by datetime.
*/
public
function
datetimeCallback
(
$form
,
FormStateInterface
$form_state
)
{
$datetime
=
$form_state
->
getValue
(
'datetime'
)[
'date'
]
.
' '
.
$form_state
->
getValue
(
'datetime'
)[
'time'
];
$response
=
new
AjaxResponse
();
$response
->
addCommand
(
new
HtmlCommand
(
'#ajax_datetime_value'
,
$datetime
));
$response
->
addCommand
(
new
DataCommand
(
'#ajax_datetime_value'
,
'form_state_value_datetime'
,
$datetime
));
return
$response
;
}
/**
* Ajax callback triggered by checkbox.
*/
...
...
core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestAjaxElementsForm.php
0 → 100644
View file @
57762d19
<?php
namespace
Drupal\ajax_forms_test\Form
;
use
Drupal\Core\Form\FormBase
;
use
Drupal\ajax_forms_test
\
Callbacks
;
use
Drupal\Core\Form\FormStateInterface
;
/**
* Form builder: Builds a form that has each FAPI elements triggering a simple
* Ajax callback.
*/
class
AjaxFormsTestAjaxElementsForm
extends
FormBase
{
/**
* {@inheritdoc}
*/
public
function
getFormId
()
{
return
'ajax_forms_test_ajax_elements_form'
;
}
/**
* {@inheritdoc}
*/
public
function
buildForm
(
array
$form
,
FormStateInterface
$form_state
)
{
$callback_object
=
new
Callbacks
();
$form
[
'datetime'
]
=
[
'#type'
=>
'datetime'
,
'#ajax'
=>
[
'callback'
=>
[
$callback_object
,
'datetimeCallback'
],
'wrapper'
=>
'ajax_datetime_value'
,
],
];
$form
[
'datetime_result'
]
=
[
'#type'
=>
'markup'
,
'#markup'
=>
'<div id="ajax_datetime_value">No date selected.</div>'
,
];
return
$form
;
}
/**
* {@inheritdoc}
*/
public
function
submitForm
(
array
&
$form
,
FormStateInterface
$form_state
)
{}
}
core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxCallbacksTest.php
0 → 100644
View file @
57762d19
<?php
namespace
Drupal\FunctionalJavascriptTests\Ajax
;
use
Drupal\FunctionalJavascriptTests\JavascriptTestBase
;
/**
* Tests Ajax callbacks on FAPI elements.
*
* @group Ajax
*/
class
AjaxCallbacksTest
extends
JavascriptTestBase
{
/**
* {@inheritdoc}
*/
public
static
$modules
=
[
'ajax_forms_test'
];
/**
* Tests if Ajax callback works on date element.
*/
public
function
testDateTimeAjaxCallback
()
{
// Test Ajax callback when date changes.
$this
->
drupalGet
(
'ajax_forms_test_ajax_element_form'
);
$this
->
assertSession
()
->
responseContains
(
'No date selected.'
);
$this
->
getSession
()
->
getPage
()
->
fillField
(
'edit-datetime-date'
,
'2016-01-01'
);
$this
->
assertSession
()
->
assertWaitOnAjaxRequest
();
$this
->
assertSession
()
->
responseNotContains
(
'No date selected.'
);
$this
->
assertSession
()
->
responseContains
(
'2016-01-01'
);
$this
->
getSession
()
->
getPage
()
->
fillField
(
'edit-datetime-time'
,
'12:00:00'
);
$this
->
assertSession
()
->
assertWaitOnAjaxRequest
();
$this
->
assertSession
()
->
responseContains
(
'2016-01-01 12:00:00'
);
}
}
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