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

Merge pull request #214 from silverstripe-droptables/ssexpress 

Tweaks to CMS required for Translatable
This commit is contained in:
Ingo Schommer 2012-10-02 02:10:47 -07:00
parent 1c50eb540a 9cf5a6f47a
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');
if($votes) {
$votes = array_filter((array)$votes, 'is_null');
if($votes) return min($votes);
return min($votes);
}
return true;

2
javascript/SiteTreeURLSegmentField.js
View File

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