From 66abd22ee539f6e10ea5afa0fcd6b20d88dc9afd Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Fri, 5 May 2017 15:35:39 +1200
Subject: [PATCH] FIX Allow linking existing documents to document sets via add
 existing upload field

---
 code/cms/DMSDocumentAddController.php         | 13 ++++++------
 javascript/DMSDocumentAddExistingField.js     |  8 ++++----
 javascript/DMSUploadField_addtemplate.js      |  4 ++--
 tests/DMSTest.php                             |  8 ++++----
 tests/dmstest.yml                             | 20 +++++++++----------
 tests/extensions/DMSSiteTreeExtensionTest.php |  5 ++---
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/code/cms/DMSDocumentAddController.php b/code/cms/DMSDocumentAddController.php
index 77c4374..03691ca 100644
--- a/code/cms/DMSDocumentAddController.php
+++ b/code/cms/DMSDocumentAddController.php
@@ -218,16 +218,17 @@ class DMSDocumentAddController extends LeftAndMain
         return Convert::raw2json($return);
     }
 
+    /**
+     * Link an existing document to the given document set ID
+     * @return string JSON
+     */
     public function linkdocument()
     {
         $return = array('error' => _t('UploadField.FIELDNOTSET', 'Could not add document to page'));
-$return = array('error' => 'testing');
-return Convert::raw2json($return);
-        $page = $this->currentPage();
-        if (!empty($page)) {
+        $documentSet = $this->getCurrentDocumentSet();
+        if (!empty($documentSet)) {
             $document = DMSDocument::get()->byId($this->getRequest()->getVar('documentID'));
-            // @todo add sets
-            $document->addPage($page);
+            $documentSet->Documents()->add($document);
 
             $buttonText = '<button class="ss-uploadfield-item-edit ss-ui-button ui-corner-all"'
                 . ' title="' . _t('DMSDocument.EDITDOCUMENT', 'Edit this document') . '" data-icon="pencil">'
diff --git a/javascript/DMSDocumentAddExistingField.js b/javascript/DMSDocumentAddExistingField.js
index 13c9864..50761b5 100644
--- a/javascript/DMSDocumentAddExistingField.js
+++ b/javascript/DMSDocumentAddExistingField.js
@@ -4,10 +4,10 @@
 	$.entwine('ss', function ($) {
 		$('.document-add-existing').entwine({
 			adddocument: function (document_id) {
-				var page_id = $(this).closest('form').find(':input[name=ID]').val();
+				var documentSetId = $(this).closest('form').find('input[name="DSID"]').val();
 
 				jQuery.ajax(
-					'admin/pages/adddocument/linkdocument?ID=' + page_id + '&documentID=' + document_id,
+					'admin/pages/adddocument/linkdocument?dsid=' + documentSetId + '&documentID=' + document_id,
 					{
 						dataType: 'json',
 						success: function (data, textstatus) {
@@ -92,7 +92,7 @@
 				doclist.load(
 					'admin/pages/adddocument/documentlist?pageID=' + $(this).val()
 				);
-				
+
 			}
 		});
 
@@ -128,4 +128,4 @@
 		});
 
 	});
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/javascript/DMSUploadField_addtemplate.js b/javascript/DMSUploadField_addtemplate.js
index 9ea0663..84b33c4 100644
--- a/javascript/DMSUploadField_addtemplate.js
+++ b/javascript/DMSUploadField_addtemplate.js
@@ -8,7 +8,7 @@ window.tmpl.cache['ss-uploadfield-addtemplate'] = tmpl(
 				'<label class="ss-uploadfield-item-name">' +
 					'<span class="name" title="{%=file.name%}">{%=file.name%}</span> ' +
 					'{% if (!file.error) { %}' +
-						'<div class="ss-uploadfield-item-status ui-state-success-text" title="'+ss.i18n._t('UploadField.AddedToPage', 'Added to Page')+'">'+ss.i18n._t('UploadField.AddedToPage', 'Added to Page')+'</div>' +
+						'<div class="ss-uploadfield-item-status ui-state-success-text" title="'+ss.i18n._t('UploadField.AddedToDocumentSet', 'Added to Document Set')+'">'+ss.i18n._t('UploadField.AddedToDocumentSet', 'Added to Document Set')+'</div>' +
 					'{% } else {  %}' +
 						'<div class="ss-uploadfield-item-status ui-state-error-text" title="{%=o.options.errorMessages[file.error] || file.error%}">{%=o.options.errorMessages[file.error] || file.error%}</div>' +
 					'{% } %}' +
@@ -27,4 +27,4 @@ window.tmpl.cache['ss-uploadfield-addtemplate'] = tmpl(
 			'{% } %}' +
 		'</li>' +
 	'{% } %}'
-);
\ No newline at end of file
+);
diff --git a/tests/DMSTest.php b/tests/DMSTest.php
index 69b5f68..a79239f 100644
--- a/tests/DMSTest.php
+++ b/tests/DMSTest.php
@@ -167,8 +167,8 @@ class DMSTest extends FunctionalTest
     {
         $pageWithEmbargoes = $this->objFromFixture('SiteTree', 's3');
         $documents = $this->dms->getByPage($pageWithEmbargoes);
-        // Fixture: 3 documents in set, 1 is embargoed
-        $this->assertCount(2, $documents, 'Embargoed documents are excluded by default');
+        // Fixture: 6 documents in set, 1 is embargoed
+        $this->assertCount(5, $documents, 'Embargoed documents are excluded by default');
         $this->assertContainsOnlyInstancesOf('DMSDocument', $documents);
     }
 
@@ -179,8 +179,8 @@ class DMSTest extends FunctionalTest
     {
         $pageWithEmbargoes = $this->objFromFixture('SiteTree', 's3');
         $documents = $this->dms->getByPage($pageWithEmbargoes, true);
-        // Fixture: 3 documents in set, 1 is embargoed
-        $this->assertCount(3, $documents, 'Embargoed documents can be included');
+        // Fixture: 6 documents in set, 1 is embargoed
+        $this->assertCount(6, $documents, 'Embargoed documents can be included');
         $this->assertContainsOnlyInstancesOf('DMSDocument', $documents);
     }
 
diff --git a/tests/dmstest.yml b/tests/dmstest.yml
index 437f09d..ab88bdd 100644
--- a/tests/dmstest.yml
+++ b/tests/dmstest.yml
@@ -46,6 +46,13 @@ Group:
   cable-guy:
     Code: cable-guy
     Title: "Cable Guy"
+Member:
+  editor:
+    Name: editor
+    Groups: =>Group.content-author
+  non-editor:
+    Name: cable-guy
+    Groups: =>Group.cable-guy
 DMSDocumentSet:
   ds1:
     Title: Document Set 1
@@ -83,20 +90,20 @@ DMSDocument:
     CanEditType: LoggedInUsers
     Folder: 5
     Tags: =>DMSTag.t1, =>DMSTag.t2, =>DMSTag.t3, =>DMSTag.t4
-    Pages: =>SiteTree.s1, =>SiteTree.s2, =>SiteTree.s3, =>SiteTree.s4, =>SiteTree.s5, =>SiteTree.s6
+    Sets: =>DMSDocumentSet.ds1, =>DMSDocumentSet.ds2, =>DMSDocumentSet.ds3, =>DMSDocumentSet.ds4
   doc-anyone:
     FileName: doc-anyone
     CanViewType: Anyone
     Folder: 5
     Tags: =>DMSTag.t1, =>DMSTag.t2, =>DMSTag.t3, =>DMSTag.t4
-    Pages: =>SiteTree.s1, =>SiteTree.s2, =>SiteTree.s3, =>SiteTree.s4, =>SiteTree.s5, =>SiteTree.s6
+    Sets: =>DMSDocumentSet.ds1, =>DMSDocumentSet.ds2, =>DMSDocumentSet.ds3, =>DMSDocumentSet.ds4
   doc-only-these-users:
     FileName: doc-only-these-users
     CanViewType: OnlyTheseUsers
     CanEditType: OnlyTheseUsers
     Folder: 5
     Tags: =>DMSTag.t1, =>DMSTag.t2, =>DMSTag.t3, =>DMSTag.t4
-    Pages: =>SiteTree.s1, =>SiteTree.s2, =>SiteTree.s3, =>SiteTree.s4, =>SiteTree.s5, =>SiteTree.s6
+    Sets: =>DMSDocumentSet.ds1, =>DMSDocumentSet.ds2, =>DMSDocumentSet.ds3, =>DMSDocumentSet.ds4
     ViewerGroups: =>Group.content-author
     EditorGroups: =>Group.content-author
   embargoed_document1:
@@ -114,10 +121,3 @@ DMSDocument:
     EmbargoUntilPublish: true
     Folder: 5
     Sets: =>DMSDocumentSet.ds5
-Member:
-  editor:
-    Name: editor
-    Groups: =>Group.content-author
-  non-editor:
-    Name: cable-guy
-    Groups: =>Group.cable-guy
diff --git a/tests/extensions/DMSSiteTreeExtensionTest.php b/tests/extensions/DMSSiteTreeExtensionTest.php
index a902cd7..288bee4 100644
--- a/tests/extensions/DMSSiteTreeExtensionTest.php
+++ b/tests/extensions/DMSSiteTreeExtensionTest.php
@@ -54,13 +54,12 @@ class DMSSiteTreeExtensionTest extends SapphireTest
     /**
      * Ensure that a page title can be retrieved with the number of related documents it has (across all document sets).
      *
-     * Note that the fixture has the same two documents attached to two different document sets, attached to this
-     * page, but we're expecting only two since they should be returned as unique only (rather than four).
+     * See fixtures for relationships that define this result.
      */
     public function testGetTitleWithNumberOfDocuments()
     {
         $siteTree = $this->objFromFixture('SiteTree', 's1');
-        $this->assertSame('testPage1 has document sets (2)', $siteTree->getTitleWithNumberOfDocuments());
+        $this->assertSame('testPage1 has document sets (5)', $siteTree->getTitleWithNumberOfDocuments());
     }
 
     /**