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 remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Ingo Schommer 2012-10-03 16:16:25 +02:00
commit 0d03c62984
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/CMSSettingsController.php
View File

@ -6,7 +6,8 @@ class CMSSettingsController extends LeftAndMain {
static $menu_priority = -1;
static $menu_title = 'Settings';
static $tree_class = 'SiteConfig';
static $required_permission_codes = array('EDIT_SITECONFIG');
public function getResponseNegotiator() {
$neg = parent::getResponseNegotiator();
$controller = $this;

3
code/model/SiteTree.php
View File

@ -1569,8 +1569,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