tonyair
/
silverstripe-dms
mirror of https://github.com/silverstripe/silverstripe-dms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge up `2.1` into `master`

This commit is contained in:
Dylan Wagstaff 2018-04-11 14:08:13 +12:00
parent eb96f4fd87 fad86bd93c
commit 86bc9ec509
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/DMS.php
View File

@ -151,7 +151,7 @@ class DMS extends Object implements DMSInterface
public function getDocumentSetsByPage(SiteTree $page) public function getDocumentSetsByPage(SiteTree $page)
{ {
return $page->getDocumentSets(); return $page->DocumentSets();
} }
/** /**

7
code/extensions/DMSSiteTreeExtension.php
View File

@ -55,11 +55,14 @@ class DMSSiteTreeExtension extends DataExtension
/** /**
* Get a list of document sets for the owner page * Get a list of document sets for the owner page
* *
* @deprecated 3.0 Use DocumentSets() instead.
*
* @return ArrayList * @return ArrayList
*/ */
public function getDocumentSets() public function getDocumentSets()
{ {
return $this->owner->DocumentSets(); Deprecation::notice('3.0', 'Use DocumentSets() instead');
return $this->owner->hasManyComponent('DocumentSets');
} }
/** /**
@ -71,7 +74,7 @@ class DMSSiteTreeExtension extends DataExtension
{ {
$documents = ArrayList::create(); $documents = ArrayList::create();
foreach ($this->getDocumentSets() as $documentSet) { foreach ($this->owner->DocumentSets() as $documentSet) {
/** @var DocumentSet $documentSet */ /** @var DocumentSet $documentSet */
$documents->merge($documentSet->getDocuments()); $documents->merge($documentSet->getDocuments());
} }

4
templates/Includes/DocumentSets.ss
View File

@ -1,6 +1,6 @@
<% if $getDocumentSets %> <% if $DocumentSets %>
<div class="documentsets"> <div class="documentsets">
<% loop $getDocumentSets %> <% loop $DocumentSets %>
<% include DocumentSet %> <% include DocumentSet %>
<% end_loop %> <% end_loop %>
</div> </div>

6
tests/DMSDocumentSetTest.php
View File

@ -50,9 +50,9 @@ class DMSDocumentSetTest extends SapphireTest
$ds2 = $this->objFromFixture('DMSDocumentSet', 'ds2'); $ds2 = $this->objFromFixture('DMSDocumentSet', 'ds2');
$ds3 = $this->objFromFixture('DMSDocumentSet', 'ds3'); $ds3 = $this->objFromFixture('DMSDocumentSet', 'ds3');
$this->assertCount(0, $s4->getDocumentSets(), 'Page 4 has no document sets associated'); $this->assertCount(0, $s4->DocumentSets(), 'Page 4 has no document sets associated');
$this->assertCount(2, $s1->getDocumentSets(), 'Page 1 has 2 document sets'); $this->assertCount(2, $s1->DocumentSets(), 'Page 1 has 2 document sets');
$this->assertEquals(array($ds1->ID, $ds2->ID), $s1->getDocumentSets()->column('ID')); $this->assertEquals(array($ds1->ID, $ds2->ID), $s1->DocumentSets()->column('ID'));
} }
/** /**

2
tests/DMSEmbargoTest.php
View File

@ -142,7 +142,7 @@ class DMSEmbargoTest extends SapphireTest
$doc->Folder = "0"; $doc->Folder = "0";
$dID = $doc->write(); $dID = $doc->write();
$s1->getDocumentSets()->first()->getDocuments()->add($doc); $s1->DocumentSets()->first()->getDocuments()->add($doc);
$s1->publish('Stage', 'Live'); $s1->publish('Stage', 'Live');
$s1->doPublish(); $s1->doPublish();

4
tests/tasks/MigrateToDocumentSetsTaskTest.php
View File

@ -65,9 +65,9 @@ class MigrateToDocumentSetsTaskTest extends SapphireTest
$this->assertContains('Skipped: already has a set: 1', $result); $this->assertContains('Skipped: already has a set: 1', $result);
// Test that some of the relationship records were written correctly // Test that some of the relationship records were written correctly
$this->assertCount(1, $firstPageSets = $this->objFromFixture('SiteTree', 'one')->getDocumentSets()); $this->assertCount(1, $firstPageSets = $this->objFromFixture('SiteTree', 'one')->DocumentSets());
$this->assertSame('Default', $firstPageSets->first()->Title); $this->assertSame('Default', $firstPageSets->first()->Title);
$this->assertCount(1, $this->objFromFixture('SiteTree', 'two')->getDocumentSets()); $this->assertCount(1, $this->objFromFixture('SiteTree', 'two')->DocumentSets());
// With dryrun enabled and being run the second time, nothing should be done // With dryrun enabled and being run the second time, nothing should be done
$result = $this->runTask(array('action' => 'create-default-document-set', 'dryrun' => '1')); $result = $this->runTask(array('action' => 'create-default-document-set', 'dryrun' => '1'));