pathToKey exposed, collectSkelData in json renderer

prototypes/tree.py

@@ -4,7 +4,7 @@
 
 from server.prototypes import BasicApplication
 from server.bones import baseBone, keyBone, numericBone
-from server.skeleton import Skeleton, skeletonByKind
+from server.skeleton import Skeleton, SkelList, skeletonByKind
 from server.tasks import callDeferred
 
 from datetime import datetime
@@ -146,10 +146,11 @@ def fixTxn( nodeKey, newRepoKey ):
 
 ## Internal exposed functions
 
+	@exposed
 	@internalExposed
-	def pathToKey( self, key ):
+	def pathToKey(self, key, *args, **kwargs):
 		"""
-		Returns the recursively expanded path through the Tree from the root-node to the given *key*.
+		Returns the recursively expanded path through the Tree from the root-node to te given *key*.
 
 		:param key: URL-safe key of the destination node.
 		:type key: str
@@ -158,29 +159,32 @@ def pathToKey( self, key ):
 		given node key.
 		:rtype: dict
 		"""
-		nodeSkel = self.viewNodeSkel()
+		skel = self.viewNodeSkel()
 
-		if not nodeSkel.fromDB( key ):
+		if not skel.fromDB(key):
 			raise errors.NotFound()
 
-		if not self.canList( "node", key ):
+		if not self.canList("node", key):
 			raise errors.Unauthorized()
 
-		res = [ self.render.collectSkelData( nodeSkel ) ]
+		res = SkelList(skel)
+		res.append(skel.getValuesCache())
 
-		for x in range(0,99):
-			if not nodeSkel["parentdir"]:
+		for x in range(0, 99):
+			if not skel["parentdir"]:
 				break
 
-			parentdir = nodeSkel["parentdir"]
-
-			nodeSkel = self.viewNodeSkel()
-			if not nodeSkel.fromDB( parentdir ):
+			parentdir = skel["parentdir"]
+			skel = self.viewNodeSkel()
+			if not skel.fromDB(parentdir):
 				break
 
-			res.append( self.render.collectSkelData( nodeSkel ) )
+			if not self.canView("node", skel):
+				continue
+
+			res.insert(0, skel.getValuesCache())
 
-		return( res[ : : -1 ] )
+		return self.render.list(res)
 
 	def ensureOwnUserRootNode( self ):
 		"""

render/html/default.py

@@ -365,7 +365,6 @@ def collectSkelData(self, skel):
 			:returns: A dictionary or list of dictionaries.
 			:rtype: dict | list
 		"""
-		#logging.error("collectSkelData %s", skel)
 		if isinstance(skel, list):
 			return [self.collectSkelData(x) for x in skel]
 		res = {}

render/json/default.py

@@ -249,10 +249,10 @@ def list(self, skellist, action = "list", params=None, **kwargs):
 
 	def editItemSuccess(self, skel, params=None, **kwargs):
 		return self.renderEntry(skel, "editSuccess", params)
-		
+
 	def addItemSuccess(self, skel, params=None, **kwargs):
 		return self.renderEntry(skel, "addSuccess", params)
-		
+
 	def addDirSuccess(self, rootNode,  path, dirname, params=None, *args, **kwargs):
 		return json.dumps("OKAY")