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

Merge pull request #214 from silverstripe-droptables/ssexpress

Browse Source 
Tweaks to CMS required for Translatable
This commit is contained in:
Ingo Schommer 2012-10-02 02:10:47 -07:00
commit a6d09988ed
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/model/SiteTree.php
View File

@ -1576,8 +1576,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$votes = $this->extend('augmentValidURLSegment'); $votes = $this->extend('augmentValidURLSegment');
if($votes) { if($votes) {
$votes = array_filter((array)$votes, 'is_null'); return min($votes);
if($votes) return min($votes);
} }
return true; return true;

2
javascript/SiteTreeURLSegmentField.js
View File

@ -5,7 +5,7 @@
* *
* Input validation on the URLSegment field * Input validation on the URLSegment field
*/ */
$('.field.urlsegment').entwine({ $('.field.urlsegment:not(.readonly)').entwine({
/** /**
* Constructor: onmatch * Constructor: onmatch