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

BUGFIX: Fixed a couple of bugs in the multiple-subsites-per-group function. (from r89803)

Browse Source
This commit is contained in:
Tom Rix 2010-03-01 21:38:04 +00:00
parent 60cc9f9650
commit b99c2c62c4
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
code/GroupSubsites.php
View File

@ -78,12 +78,15 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider {
$subsiteMap)); $subsiteMap));
} else { } else {
if (sizeof($subsiteMap) <= 1) $dropdown = $dropdown->transform(new ReadonlyTransformation()) ; if (sizeof($subsiteMap) <= 1) {
$tab->push($dropdown); $fields->addFieldToTab("Root.Subsites", new ReadonlyField("SubsitesHuman",
_t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'),
$fields->addFieldToTab("Root.Subsites", new CheckboxSetField("Subsites", reset($subsiteMap)));
_t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'), } else {
$subsiteMap)); $fields->addFieldToTab("Root.Subsites", new CheckboxSetField("Subsites",
_t('GroupSubsites.ACCESSRADIOTITLE', 'Give this group access to'),
$subsiteMap));
}
} }
} }
} }
@ -138,6 +141,8 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider {
= {$q}Group{$q}.{$q}ID{$q} AND {$q}Group_Subsites{$q}.{$q}SubsiteID{$q} = $subsiteID"); = {$q}Group{$q}.{$q}ID{$q} AND {$q}Group_Subsites{$q}.{$q}SubsiteID{$q} = $subsiteID");
$query->where[] = "({$q}Group_Subsites{$q}.{$q}SubsiteID{$q} IS NOT NULL OR $query->where[] = "({$q}Group_Subsites{$q}.{$q}SubsiteID{$q} IS NOT NULL OR
{$q}Group{$q}.{$q}AccessAllSubsites{$q} = 1)"; {$q}Group{$q}.{$q}AccessAllSubsites{$q} = 1)";
if(!$query->groupby) $query->groupby[] = "\"Group\".\"ID\"";
} else { } else {
$query->where[] = "{$q}Group{$q}.{$q}AccessAllSubsites{$q} = 1"; $query->where[] = "{$q}Group{$q}.{$q}AccessAllSubsites{$q} = 1";
} }