Merge pull request #167 from creative-commoners/pulls/2.0/fix-backlin…

…k-for-documentadmin FIX Backlink for upload form redirects to document admin if no page is available
silverstripe · Jun 8, 2017 · b0de8b3 · b0de8b3
2 parents c0dee2f + 772198a
commit b0de8b3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/code/cms/DMSDocumentAddController.php b/code/cms/DMSDocumentAddController.php
@@ -187,11 +187,21 @@ public function Breadcrumbs($unlinked = false)
      */
     public function Backlink()
     {
-        if (!$this->getRequest()->getVar('dsid')) {
+        if (!$this->getRequest()->getVar('dsid') || !$this->currentPageID()) {
             $modelAdmin = new DMSDocumentAdmin;
             $modelAdmin->init();
-            return $modelAdmin->Link();
+
+            if ($this->getRequest()->getVar('dsid')) {
+                return Controller::join_links(
+                    $modelAdmin->Link('DMSDocumentSet'),
+                    'EditForm/field/DMSDocumentSet/item',
+                    $this->getRequest()->getVar('dsid'),
+                    'edit'
+                );
+            }
+            return $modelAdmin->Link('DMSDocumentSet');
         }
+
         return Controller::join_links(
             singleton('CMSPagesController')->Link(),
             'edit/EditForm/field/Document%20Sets/item',

diff --git a/tests/cms/DMSDocumentAddControllerTest.php b/tests/cms/DMSDocumentAddControllerTest.php
@@ -64,12 +64,20 @@ public function testGetAllowedExtensions()
      */
     public function testBacklink()
     {
+        // No page ID and no document set ID
         $this->assertContains('admin/documents', $this->controller->Backlink());
 
+        // No page ID, has document set ID
         $request = new SS_HTTPRequest('GET', '/', array('dsid' => 123));
         $this->controller->setRequest($request);
         $this->assertContains('EditForm', $this->controller->Backlink());
         $this->assertContains('123', $this->controller->Backlink());
+
+        // Has page ID and document set ID
+        $request = new SS_HTTPRequest('GET', '/', array('dsid' => 123, 'ID' => 234));
+        $this->controller->setRequest($request);
+        $this->assertContains('admin/pages', $this->controller->Backlink());
+        $this->assertContains('123', $this->controller->Backlink());
     }
 
     /**