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: Fix subsites permissions not paying attention to roles (from r87163) (from r96278)

Browse Source
This commit is contained in:
Tom Rix 2010-03-01 21:57:05 +00:00
parent cf765abed8
commit 9536ae6f01
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/Subsite.php
View File

@ -537,6 +537,27 @@ JS;
LEFT JOIN \"Permission\" ON \"Group\".\"ID\"=\"Permission\".\"GroupID\""
>>>>>>> .merge-right.r88146
);
$rolesSubsites = DataObject::get(
'Subsite',
"`Group_Members`.`MemberID` = $member->ID
AND `PermissionRoleCode`.`Code` IN ($SQL_codes, 'ADMIN')
AND `Subsite`.Title != ''",
'',
"LEFT JOIN `Group` ON (`SubsiteID`=`Subsite`.`ID` OR `SubsiteID` = 0)
LEFT JOIN `Group_Members` ON `Group_Members`.`GroupID`=`Group`.`ID`
LEFT JOIN `Group_Roles` ON `Group_Roles`.`GroupID`=`Group`.`ID`
LEFT JOIN `PermissionRole` ON `Group_Roles`.`PermissionRoleID`=`PermissionRole`.`ID`
LEFT JOIN `PermissionRoleCode` ON `PermissionRole`.`ID`=`PermissionRoleCode`.`RoleID`"
);
if(!$subsites && $rolesSubsites) return $rolesSubsites;
if($rolesSubsites) foreach($rolesSubsites as $subsite) {
if(!$subsites->containsIDs(array($subsite->ID))) {
$subsites->push($subsite);
}
}
$rolesSubsites = DataObject::get(
'Subsite',