tonyair/silverstripe-dms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-dms synced 2024-06-20 11:41:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0'

Browse Source
This commit is contained in:
Robbie Averill 2017-07-31 22:04:36 +12:00
commit 97d55603d6
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_config.php
View File

@ -19,3 +19,9 @@ if ($config->get('DMSDocument_versions', 'enable_versions')) {
//using the same db relations for the versioned documents, as for the actual documents
$config->update('DMSDocument_versions', 'db', $config->get('DMSDocument', 'db'));
}
// add dmsassets folder to file system sync exclusion
if (strpos($config->get('DMS', 'folder_name'), 'assets/') === 0) {
$folderName = substr($config->get('DMS', 'folder_name'), 7);
$config->update('Filesystem', 'sync_blacklisted_patterns', array("/^" . $folderName . "$/i",));
}

14
tests/DMSTest.php
View File

@ -166,4 +166,18 @@ class DMSTest extends FunctionalTest
$this->assertCount(2, $sets);
$this->assertContainsOnlyInstancesOf('DMSDocumentSet', $sets);
}
/**
* Ensure that assets/* folders are not included in filesystem sync operations
*/
public function testFolderExcludedFromFilesystemSync()
{
// Undo setup config changes
Config::unnest();
Config::nest();
$result = Filesystem::config()->get('sync_blacklisted_patterns');
$folderName = substr(DMS::config()->get('folder_name'), 7);
$this->assertContains('/^' . $folderName . '$/i', $result);
}
}