Skip to content

Commit 70e635a

Browse files
author
Stig Lindqvist
committed
Merge pull request #38 from tractorcow/pulls/fix-env-perms
BUG Fix issue creating environments
2 parents c44977b + 6816e58 commit 70e635a

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

code/model/DNEnvironment.php

+13-11
Original file line numberDiff line numberDiff line change
@@ -746,19 +746,21 @@ protected function buildPermissionField($groupField, $memberField, $groups, $mem
746746
public function getCMSFields() {
747747
$fields = new FieldList(new TabSet('Root'));
748748

749-
$groups = $this
750-
->Project()
751-
->Viewers()
752-
->sort('Title')
753-
->map()
754-
->toArray();
755-
$members = array();
756-
foreach($this->Project()->Viewers() as $group) {
757-
foreach($group->Members()->map() as $k => $v) {
758-
$members[$k] = $v;
749+
$project = $this->Project();
750+
if($project && $project->exists()) {
751+
$viewerGroups = $project->Viewers();
752+
$groups = $viewerGroups->sort('Title')->map()->toArray();
753+
$members = array();
754+
foreach($viewerGroups as $group) {
755+
foreach($group->Members()->map() as $k => $v) {
756+
$members[$k] = $v;
757+
}
759758
}
759+
asort($members);
760+
} else {
761+
$groups = array();
762+
$members = array();
760763
}
761-
asort($members);
762764

763765
// Main tab
764766
$fields->addFieldsToTab('Root.Main', array(

0 commit comments

Comments
 (0)