Skip to content

Commit 1a9b93c

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fix web_profiler full default conf set allow_if_all_abstain to false Add missing allow_if_all_abstain parameter Mentioned how to override each children of a choice type
2 parents c447676 + 9661886 commit 1a9b93c

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

form/create_custom_field_type.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,14 @@ link for details), create a ``shipping_widget`` block to handle this:
163163
<?php echo $view['form']->renderBlock('choice_widget') ?>
164164
<?php endif ?>
165165

166+
.. tip::
167+
168+
You can further customize the template used to render each children of the
169+
choice type. The block to override in that case is named "block name" +
170+
``_entry`` + "element name" (``label``, ``errors`` or ``widget``) (e.g. to
171+
customize the labels of the children of the Shipping widget you'd need to
172+
define ``{% block shipping_entry_label %} ... {% endblock %}``).
173+
166174
.. note::
167175

168176
Make sure the correct widget prefix is used. In this example the name should

reference/configuration/web_profiler.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Full Default Configuration
8181
toolbar: false
8282
position: bottom
8383
intercept_redirects: false
84-
excluded_ajax_paths: ^/bundles|^/_wdt
84+
excluded_ajax_paths: ^/(app(_[\\w]+)?\\.php/)?_wdt
8585
8686
# DEPRECATED, it can be removed safely from your configuration
8787
verbose: true
@@ -102,6 +102,6 @@ Full Default Configuration
102102
toolbar="false"
103103
verbose="true"
104104
intercept-redirects="false"
105-
excluded-ajax-paths="^/bundles|^/_wdt"
105+
excluded-ajax-paths="^/(app(_[\\w]+)?\\.php/)?_wdt"
106106
/>
107107
</container>

security/voters.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ security configuration:
311311
security:
312312
access_decision_manager:
313313
strategy: unanimous
314+
allow_if_all_abstain: false
314315
315316
.. code-block:: xml
316317
@@ -324,7 +325,7 @@ security configuration:
324325
>
325326
326327
<config>
327-
<access-decision-manager strategy="unanimous" />
328+
<access-decision-manager strategy="unanimous" allow-if-all-abstain="false" />
328329
</config>
329330
</srv:container>
330331
@@ -334,5 +335,6 @@ security configuration:
334335
$container->loadFromExtension('security', array(
335336
'access_decision_manager' => array(
336337
'strategy' => 'unanimous',
338+
'allow_if_all_abstain' => false,
337339
),
338340
));

0 commit comments

Comments
 (0)