Changes for page 3D Printing

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -15,36 +15,44 @@
15	15
16	16
17	17	{{velocity}}
18		-##
19		-## Velocity macro to list all subpages of the "Areas" page
20		-##
21		-#macro(listAreasSubpages)
22		- ## Full name of the parent document (top-level page "Areas")
23		- #set($parentDocFullName = 'Areas.WebHome')
	18	+## Recursive helper: lists all descendants of $parentRef
	19	+#macro(listPrintingGuidesRecursive $parentRef)
	20	+ #set($parentDoc = $xwiki.getDocument($parentRef))
	21	+ #set($children = $parentDoc.getChildren())
	22	+ #if($children && !$children.isEmpty())
	23	+ #foreach($childRef in $children)
	24	+ #set($childDoc = $xwiki.getDocument($childRef))
	25	+ #set($title = $childDoc.getDisplayTitle())
	26	+ ## Only show pages whose title contains "Printing Guide"
	27	+ #if($title && $title.indexOf('Printing Guide') != -1)
	28	+ #set($hasResults = true)
	29	+ * [[$title>>$childDoc]]
	30	+ #end
	31	+ ## Recurse into this child regardless of whether it matched
	32	+ #listPrintingGuidesRecursive($childRef)
	33	+ #end
	34	+ #end
	35	+#end
24	24
25		- ## HQL: get all non-hidden children whose parent is Areas.WebHome
26		- #set($hql =
27		- "select doc.fullName " +
28		- "from XWikiDocument doc " +
29		- "where doc.parent = :parent and doc.hidden <> true " +
30		- "order by doc.name asc"
31		- )
	37	+#macro(list3DPrintersSubpages)
	38	+ #set($wikiName = $xcontext.database)
	39	+ #set($parentRef = $services.model.createDocumentReference(
	40	+ $wikiName,
	41	+ ['Areas', 'Upstairs', '3D Printing'],
	42	+ 'WebHome'
	43	+ ))
32	32
33		- #set($children = $services.query.hql($hql)
34		- .bindValue('parent', $parentDocFullName)
35		- .execute())
	45	+ #set($hasResults = false)
	46	+ #listPrintingGuidesRecursive($parentRef)
36	36
37		- #if($children.isEmpty())
38		- No subpages found under **Areas**.
39		- #else
40		- #foreach($childFullName in $children)
41		- #set($childDoc = $xwiki.getDocument($childFullName))
42		- * [[$childDoc.displayTitle>>$childDoc.getURL('view')]]
43		- #end
	48	+ #if(!$hasResults)
	49	+ No pages with "Printing Guide" in the title found under [[Areas.Upstairs.3D Printers]].
44	44	#end
45	45	#end
46	46
47		-## Call the macro
48		-#listAreasSubpages()
	53	+#list3DPrintersSubpages()
49	49	{{/velocity}}
50	50
	56	+
	57	+
	58	+