From cbd3a65fa926fc2bced6cc60d0ad249ec869528b Mon Sep 17 00:00:00 2001
From: Sacha Judd <sjudd@silverstripe.com>
Date: Fri, 2 Jun 2017 11:36:27 +1200
Subject: [PATCH] FIX Add 'add document set' button and update label for Page

---
 code/cms/DMSDocumentAdmin.php      | 2 --
 code/model/DMSDocumentSet.php      | 3 +++
 lang/en.yml                        | 1 +
 tests/cms/DMSDocumentAdminTest.php | 9 ---------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/code/cms/DMSDocumentAdmin.php b/code/cms/DMSDocumentAdmin.php
index b56d8bf..7f11371 100644
--- a/code/cms/DMSDocumentAdmin.php
+++ b/code/cms/DMSDocumentAdmin.php
@@ -43,8 +43,6 @@ class DMSDocumentAdmin extends ModelAdmin
             $gridFieldConfig->removeComponentsByType('GridFieldAddNewButton');
             $gridFieldConfig->addComponent(new DMSGridFieldAddNewButton('buttons-before-left'), 'GridFieldExportButton');
         } elseif ($this->modelClass === 'DMSDocumentSet') {
-            $gridFieldConfig->removeComponentsByType('GridFieldAddNewButton');
-
             $dataColumns = $gridFieldConfig->getComponentByType('GridFieldDataColumns');
             $fields = $dataColumns->getDisplayFields($gridField);
             $fields = array('Title' => 'Title', 'Page.Title' => 'Page') + $fields;
diff --git a/code/model/DMSDocumentSet.php b/code/model/DMSDocumentSet.php
index 005524f..6c6cb28 100644
--- a/code/model/DMSDocumentSet.php
+++ b/code/model/DMSDocumentSet.php
@@ -117,6 +117,9 @@ class DMSDocumentSet extends DataObject
                     $gridFieldConfig->addComponent($sortableComponent);
                 }
 
+                $field = $fields->fieldByName('Root.Main.PageID');
+                $field->setTitle(_t('DMSDocumentSet.SHOWONPAGE', 'Show on page'));
+
                 $gridFieldConfig->getComponentByType('GridFieldDataColumns')
                     ->setDisplayFields($self->getDocumentDisplayFields())
                     ->setFieldCasting(array('LastEdited' => 'Datetime->Ago'))
diff --git a/lang/en.yml b/lang/en.yml
index 8c3a4b3..39ea8cb 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -26,6 +26,7 @@ en:
     ADDDOCUMENTSBUTTON: Add Documents
     GRIDFIELD_NOTICE: Managing documents will be available once you have created this document set.
     PLURALNAME: Document Sets
+    SHOWONPAGE: Show on page
     SINGULARNAME: Document Set
   DMSDocumentTaxonomyExtension:
     TAGS: Tags
diff --git a/tests/cms/DMSDocumentAdminTest.php b/tests/cms/DMSDocumentAdminTest.php
index 680aa3c..38f5aea 100644
--- a/tests/cms/DMSDocumentAdminTest.php
+++ b/tests/cms/DMSDocumentAdminTest.php
@@ -47,15 +47,6 @@ class DMSDocumentAdminTest extends FunctionalTest
         $this->assertEquals(200, $this->get('admin/documents')->getStatusCode());
     }
 
-    /**
-     * Check that the document sets GridField has had its "add new" button removed
-     */
-    public function testDocumentSetsGridFieldHasNoAddButton()
-    {
-        $result = (string) $this->get('admin/documents/DMSDocumentSet')->getBody();
-        $this->assertNotContains('Add Document Set', $result);
-    }
-
     /**
      * Check that the document sets GridField has a data column for the parent page title. Here we check for the
      * Page title existing in the DOM, since "Page" is guaranteed to exist somewhere else.