Merge pull request ezsystems#143 from ezsystems/ezp27762_content_edit…

…_routing_conflict_legacy EZP-27762 content/edit routing conflict with legacy
ezpublishlegacy · Sep 20, 2017 · 8113ee3 · 8113ee3
2 parents 4c01cad + e045a48
commit 8113ee3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bundle/Resources/config/routing.yml b/bundle/Resources/config/routing.yml
@@ -3,8 +3,8 @@ ez_content_create_no_draft:
     defaults:
         _controller: ez_content_edit:createWithoutDraftAction
 
-ez_content_edit:
-    path: /content/edit/{contentId}/{versionNo}/{language}
+ez_content_draft_edit:
+    path: /content/edit/draft/{contentId}/{versionNo}/{language}
     defaults:
         _controller: ez_content_edit:editContentDraftAction
         language: null

diff --git a/doc/specifications/content_edit.md b/doc/specifications/content_edit.md
@@ -34,7 +34,7 @@ The actual creation of the draft is delegated to the FormProcessor API, by firin
 ### Editing a draft
 > A route that displays a content editing form, with options to discard, save or publish.
 
-- path: `/content/edit/{contentId}/{versionNo}/{language}`
+- path: `/content/edit/draft/{contentId}/{versionNo}/{language}`
 - controller action: `ContentEditController::editContentDraftAction`
 
 `language` is optional.

diff --git a/lib/Form/Processor/ContentFormProcessor.php b/lib/Form/Processor/ContentFormProcessor.php
@@ -59,7 +59,7 @@ public function processSaveDraft(FormActionEvent $event)
         $languageCode = $formConfig->getOption('languageCode');
         $draft = $this->saveDraft($data, $languageCode);
 
-        $defaultUrl = $this->router->generate('ez_content_edit', [
+        $defaultUrl = $this->router->generate('ez_content_draft_edit', [
             'contentId' => $draft->id,
             'versionNo' => $draft->getVersionInfo()->versionNo,
             'language' => $languageCode,
@@ -113,7 +113,7 @@ public function processCreateDraft(FormActionEvent $event)
         $versionInfo = $this->contentService->loadVersionInfo($contentInfo, $createContentDraft->fromVersionNo);
         $contentDraft = $this->contentService->createContentDraft($contentInfo, $versionInfo);
 
-        $contentEditUrl = $this->router->generate('ez_content_edit', [
+        $contentEditUrl = $this->router->generate('ez_content_draft_edit', [
             'contentId' => $contentDraft->id,
             'versionNo' => $contentDraft->getVersionInfo()->versionNo,
             'language' => $contentDraft->contentInfo->mainLanguageCode,