tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

API SiteTree->validURLSegment() prioritizes extension votes

Browse Source 
Tri-state, use NULL to ignore the extension result
This commit is contained in:
Ingo Schommer 2013-06-12 12:32:42 +02:00
parent 4bc942df76
commit 0c4b2f8157
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/model/SiteTree.php
View File

@ -1588,20 +1588,20 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} }
} }
$existingPage = DataObject::get_one( $votes = array_filter(
'SiteTree', (array)$this->extend('augmentValidURLSegment'),
"\"URLSegment\" = '$this->URLSegment' $IDFilter $parentFilter" function($v) {return !is_null($v);}
); );
if ($existingPage) {
return false;
}
$votes = $this->extend('augmentValidURLSegment');
if($votes) { if($votes) {
return min($votes); return min($votes);
} }
return true; $existingPage = DataObject::get_one(
'SiteTree',
"\"URLSegment\" = '$this->URLSegment' $IDFilter $parentFilter"
);
return !($existingPage);
} }
/** /**

21
tests/model/SiteTreeTest.php
View File

@ -4,6 +4,7 @@
* @subpackage tests * @subpackage tests
*/ */
class SiteTreeTest extends SapphireTest { class SiteTreeTest extends SapphireTest {
protected static $fixture_file = 'SiteTreeTest.yml'; protected static $fixture_file = 'SiteTreeTest.yml';
protected $illegalExtensions = array( protected $illegalExtensions = array(
@ -700,6 +701,18 @@ class SiteTreeTest extends SapphireTest {
$this->assertTrue($sitetree->validURLSegment(), 'Valid URLSegment values are allowed'); $this->assertTrue($sitetree->validURLSegment(), 'Valid URLSegment values are allowed');
} }
public function testURLSegmentPrioritizesExtensionVotes() {
$sitetree = new SiteTree();
$sitetree->URLSegment = 'unique-segment';
$this->assertTrue($sitetree->validURLSegment());
SiteTree::add_extension('SiteTreeTest_Extension');
$sitetree = new SiteTree();
$sitetree->URLSegment = 'unique-segment';
$this->assertFalse($sitetree->validURLSegment());
SiteTree::remove_extension('SiteTreeTest_Extension');
}
public function testURLSegmentMultiByte() { public function testURLSegmentMultiByte() {
$origAllow = Config::inst()->get('URLSegmentFilter', 'default_allow_multibyte'); $origAllow = Config::inst()->get('URLSegmentFilter', 'default_allow_multibyte');
Config::inst()->update('URLSegmentFilter', 'default_allow_multibyte', true); Config::inst()->update('URLSegmentFilter', 'default_allow_multibyte', true);
@ -960,3 +973,11 @@ class SiteTreeTest_StageStatusInherit extends SiteTree implements TestOnly {
return $flags; return $flags;
} }
} }
class SiteTreeTest_Extension extends DataExtension implements TestOnly {
public function augmentValidURLSegment() {
return false;
}
}