Skip to content

Commit

Permalink
bug #2737 url_encode referer in delete_form instead of from callers (…
Browse files Browse the repository at this point in the history
…alterphp)

This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #2737).

Discussion
----------

url_encode referer in delete_form instead of from callers

Referer passed to `_delete_form` template was only URL encoded from `list`, not form `edit`, neither `show`.

If the referer contained another entity than the one that is deleted from an edit view => the deletion of the entity from the referer was attempted !

This PR uniformizes the URL encoding of the referer by applying url_encode filter in `_delete_form` template and removing from caller (only list did).

Commits
-------

154fa34 URLEncode referer in delete_form instead of from callers
  • Loading branch information
javiereguiluz committed May 29, 2019
2 parents 8d98254 + 154fa34 commit 73dcb7f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
@@ -1,6 +1,6 @@
{{
form(delete_form, {
action: delete_form.vars.action ~ ('?' in delete_form.vars.action ? '&' : '?') ~ 'referer=' ~ referer,
action: delete_form.vars.action ~ ('?' in delete_form.vars.action ? '&' : '?') ~ 'referer=' ~ referer|url_encode,
method: 'DELETE',
attr: { id: 'delete-form', style: 'display: none' }
})
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/default/list.html.twig
Expand Up @@ -185,7 +185,7 @@

{{ include('@EasyAdmin/default/includes/_delete_form.html.twig', {
view: 'list',
referer: referer|url_encode,
referer: referer,
delete_form: delete_form_template,
_translation_domain: _entity_config.translation_domain,
_trans_parameters: _trans_parameters,
Expand Down

0 comments on commit 73dcb7f

Please sign in to comment.