From d31f10ef33d4542c42b45b0594de144bb0e4ee8e Mon Sep 17 00:00:00 2001 From: Jan Halfar Date: Wed, 1 Oct 2014 14:57:41 +0200 Subject: [PATCH] code clean up and fix of access rule for groups : allowing access, if nodes groups are empty --- server/repo/content/repoNode.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server/repo/content/repoNode.go b/server/repo/content/repoNode.go index 1d10f3e..ca21cc7 100644 --- a/server/repo/content/repoNode.go +++ b/server/repo/content/repoNode.go @@ -57,19 +57,18 @@ func (node *RepoNode) InPath(path []*Item) bool { } func (node *RepoNode) InState(state string) bool { - if(len(node.States) == 0) { + if len(node.States) == 0 { return true } else { for _, nodeState := range node.States { - if(state == nodeState) { + if state == nodeState { return true } } - return false; + return false } } - func (node *RepoNode) InRegion(region string) bool { for _, nodeRegion := range node.Regions { if nodeRegion == region { @@ -148,7 +147,7 @@ func (node *RepoNode) IsOneOfTheseMimeTypes(mimeTypes []string) bool { } func (node *RepoNode) CanBeAccessedByGroups(groups []string) bool { - if len(groups) == 0 { + if len(groups) == 0 || len(node.Groups) == 0 { return true } else { // @todo is there sth like in_array ... or some array intersection