Merge branch 'release/1.2.0'

Vagrantfile

@@ -8,9 +8,6 @@ sudo apt-get install content-server
 SCRIPT
 
 Vagrant.configure("2") do |config|
-  config.vm.network :private_network, ip: "192.168.33.99"
-  config.vm.network :forwarded_port, guest: 22, host: 2299
-
   config.vbguest.no_remote = true
   config.vbguest.auto_update = false
 

contentserver.go

@@ -23,7 +23,7 @@ const (
 
 var contentServer string
 
-var uniqushPushVersion = "content-server 1.1.0"
+var uniqushPushVersion = "content-server 1.2.0"
 
 var showVersionFlag = flag.Bool("version", false, "Version info")
 var protocol = flag.String("protocol", PROTOCOL_TCP, "what protocol to server for")

server/repo/repo.go

@@ -2,10 +2,11 @@ package repo
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/foomo/contentserver/server/log"
 	"github.com/foomo/contentserver/server/repo/content"
 	"github.com/foomo/contentserver/server/requests"
-	"strings"
 )
 
 type Dimension struct {
@@ -152,6 +153,12 @@ func (repo *Repo) GetContent(r *requests.Content) *content.SiteContent {
 		c.Item = node.ToItem([]string{})
 		c.Path = node.GetPath()
 		c.Data = node.Data
+		// fetch URIs for all dimensions
+		uris := make(map[string]string)
+		for dimensionName, _ := range repo.Directory {
+			uris[dimensionName] = repo.GetURI(dimensionName, node.Id)
+		}
+		c.URIs = uris
 	} else {
 		log.Notice("404 for " + r.URI)
 		c.Status = content.STATUS_NOT_FOUND
@@ -161,6 +168,7 @@ func (repo *Repo) GetContent(r *requests.Content) *content.SiteContent {
 	if resolved == false {
 		resolvedDimension = r.Env.Dimensions[0]
 	}
+	// add navigation trees
 	for treeName, treeRequest := range r.Nodes {
 		log.Debug("  adding tree " + treeName + " " + treeRequest.Id)
 		if treeNode, ok := repo.Directory[resolvedDimension].Directory[treeRequest.Id]; ok {