Problem/Motivation

Proposed resolution

Remaining tasks

User interface changes

API changes

CommentFileSizeAuthor
#14 interdiff.txt591 bytesdawehner
#14 cancel_route-2305023-14.patch48.36 KBdawehner
#9 interdiff.txt1.04 KBdawehner
#9 cancel_route-2305023-9.patch47.78 KBdawehner
#7 interdiff.txt1.28 KBdawehner
#7 cancel_route-2305023-6.patch47.7 KBdawehner
#5 2305023-cancel_route-5.patch47.14 KBdawehner
#5 interdiff.txt1.61 KBdawehner
#3 2305023-cancel_route-3.patch46.6 KBdawehner

Comments

yesct’s picture

yesct commented
Related issues: +#2305023: Rename getCancelRoute to getCancelUrl
yesct’s picture

yesct commented
Related issues: -#2305023: Rename getCancelRoute to getCancelUrl

oops.

dawehner’s picture

dawehner
Primary language German
commented
Status: Active » Needs review
StatusFileSize
new 2305023-cancel_route-3.patch46.6 KB

Let's do it.

Status: Needs review » Needs work

The last submitted patch, 3: 2305023-cancel_route-3.patch, failed testing.

dawehner’s picture

dawehner
Primary language German
commented
Status: Needs work » Needs review
StatusFileSize
new interdiff.txt1.61 KB
new 2305023-cancel_route-5.patch47.14 KB

Let's see.

Status: Needs review » Needs work

The last submitted patch, 5: 2305023-cancel_route-5.patch, failed testing.

dawehner’s picture

dawehner
Primary language German
commented
Status: Needs work » Needs review
StatusFileSize
new cancel_route-2305023-6.patch47.7 KB
new interdiff.txt1.28 KB

Let's see again.

Status: Needs review » Needs work

The last submitted patch, 7: cancel_route-2305023-6.patch, failed testing.

dawehner’s picture

dawehner
Primary language German
commented
Status: Needs work » Needs review
StatusFileSize
new cancel_route-2305023-9.patch47.78 KB
new interdiff.txt1.04 KB

There we go.

tim.plunkett’s picture

tim.plunkett
he/him
Primary language English
Location Philadelphia
commented
Status: Needs review » Reviewed & tested by the community 
+++ b/core/modules/node/src/Form/NodeRevisionRevertForm.php
@@ -67,7 +68,8 @@ public function getQuestion() {
-  public function getCancelRoute() {
+  public function getCancelUrl() {
+    return new Url('node.revision_overview', array('node' => $this->revision->id()));

@@ -91,8 +93,6 @@ public function buildForm(array $form, array &$form_state, $node_revision = NULL
-    // @todo Convert to getCancelRoute() after http://drupal.org/node/1863906.
-    $form['actions']['cancel']['#href'] = 'node/' . $this->revision->id() . '/revisions';

Thank you!

catch’s picture

catch
he/him
Primary language English
commented
Status: Reviewed & tested by the community » Needs review

Looks good apart from:

    watchdog('contact', 'Category %label has been deleted.', array('%label' => $this->entity->label()), WATCHDOG_NOTICE);
-    $form_state['redirect_route'] = $this->getCancelRoute();
+    $form_state['redirect_route'] = $this->getCancelUrl();
   }

Not $form_state['redirect_url'] then?

dawehner’s picture

dawehner
Primary language German
commented
Status: Needs review » Reviewed & tested by the community

Opened up a follow up https://www.drupal.org/node/2309039 given that this issue is just about Confirm forms, not abouta ll forms and all its various instances of redirects.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Needs work

Needs to change MenuLinkContentDeleteForm too

dawehner’s picture

dawehner
Primary language German
commented
Status: Needs work » Reviewed & tested by the community
StatusFileSize
new cancel_route-2305023-14.patch48.36 KB
new interdiff.txt591 bytes

.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Fixed
Issue tags: +Needs change record updates

Need to update https://www.drupal.org/list-changes/published/drupal?keywords_descriptio...

And can this issue be added to those CR's. Thanks.

Committed 59c3c97 and pushed to 8.x. Thanks!

  • alexpott committed 59c3c97 on 8.x 
    Issue #2305023 by dawehner: Fixed Rename getCancelRoute to getCancelUrl.
dawehner’s picture

dawehner
Primary language German
commented
Issue tags: -Needs change record updates

Updated those. Thank you for linking.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.