Changes for page IncidentGallery

Summary

• Objects (3 modified, 0 added, 0 removed)
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[0]
  • XWiki.WikiMacroParameterClass[1]

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,74 +1,80 @@
1		-{{groovy bindings="tags,max"}}
2		-def includeTags = (context.macro.params.tags ?: "").split(',')*.trim()*.toLowerCase().findAll { it } // removes blanks
3		-def maxCount = context.macro.params.max?.toInteger() ?: 999
	1	+{{groovy}}
	2	+def binding = binding
	3	+def tags = binding.getVariable('tags')
	4	+def max = binding.getVariable('max')
4	4
	6	+def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
	7	+def maxCount = max?.toInteger() ?: 999
5	5
6		-def hql = """
7		- select doc.fullName
8		- from XWikiDocument doc, BaseObject obj
9		- where obj.name = doc.fullName
10		- and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass'
11		- order by doc.date desc
12		-"""
13	13
14		-def docs = xwiki.search(hql, maxCount, 0)
15		-def results = []
	10	+ def hql = """
	11	+ select doc.fullName
	12	+ from XWikiDocument doc, BaseObject obj
	13	+ where obj.name = doc.fullName
	14	+ and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass'
	15	+ order by doc.date desc
	16	+ """
16	16
17		-docs.each { docName ->
18		- if (results.size() >= maxCount) return
	18	+ def docs = xwiki.search(hql, maxCount, 0)
	19	+ def results = []
19	19
20		- def doc = xwiki.getDocument(docName)
21		- def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
22		- if (!obj) return
	21	+ docs.each { docName ->
	22	+ if (results.size() >= maxCount) return
23	23
24		- // extract fields
25		- def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
26		- def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
27		- def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
28		- def tagList = obj.getProperty("tags")?.value
	24	+ def doc = xwiki.getDocument(docName)
	25	+ def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
	26	+ if (!obj) return
29	29
30		- if (!title || !summary) return
	28	+ def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
	29	+ def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
	30	+ def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
	31	+ def tagList = obj.getProperty("tags")?.value
31	31
32		- // tag filtering
33		- if (includeTags && tagList) {
34		- def tagNames = tagList.collect { it.toString().toLowerCase() }
35		- if (!tagNames.any { includeTags.contains(it) }) return
36		- }
	33	+ if (!title || !summary) return
37	37
38		- def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
39		- def linkTarget = isValidURL ? externalURL : "doc:${docName}"
40		- def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
	35	+ if (includeTags && tagList) {
	36	+ def tagNames = tagList.collect { it.toString().toLowerCase() }
	37	+ if (!tagNames.any { includeTags.contains(it) }) return
	38	+ }
41	41
42		- def imageFile = doc.getAttachmentList()?.find {
43		- it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
44		- }?.filename
	40	+ def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
	41	+ def linkTarget = isValidURL ? externalURL : "doc:${docName}"
	42	+ def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
45	45
46		- def imageMarkup = ""
47		- if (imageFile) {
48		- imageMarkup = "[[image:${doc.fullName}@${imageFile}||alt=\"Image\" data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]"
49		- }
	44	+ def imageFile = doc.getAttachmentList()?.find {
	45	+ it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
	46	+ }?.filename
50	50
51		- def block = """
52		- (% style="margin-bottom:20px; width:100%" %)
53		- |${imageMarkup}|
	48	+ def imageMarkup = ""
	49	+ if (imageFile) {
	50	+ imageMarkup = "[[image:${doc.fullName}@${imageFile}||alt=\"Image\" data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]"
	51	+ }
54	54
55		- === [[${safeTitle}>>${linkTarget}]] ===
	53	+ def block = """
	54	+ (% style="margin-bottom:20px; width:100%" %)
	55	+ |${imageMarkup}|
56	56
57		- ${summary}
58		- [[Read More>>${linkTarget}]]
59		- """.trim()
	57	+ === [[${safeTitle}>>${linkTarget}]] ===
60	60
61		- results << block
62		-}
	59	+ ${summary}
	60	+ [[Read More>>${linkTarget}]]
	61	+ """.trim()
63	63
64		-if (results.isEmpty()) {
65		- if (includeTags) {
66		- println "⚠️ No incidents found for tags: ${parameters.tags}"
	63	+ results << block
	64	+ }
	65	+
	66	+ if (results.isEmpty()) {
	67	+ if (includeTags) {
	68	+ println "⚠️ No incidents found for tags: ${tags}"
	69	+ } else {
	70	+ println "⚠️ No incidents to display."
	71	+ }
67	67	} else {
68		- println "⚠️ No incidents to display."
	73	+ println results.join("\n\n")
69	69	}
70		-} else {
71		- println results.join("\n\n")
72	72	}
	76	+
	77	+// ✅ This is the actual macro parameter call
	78	+render(tags, max)
73	73	{{/groovy}}
74	74

XWiki.WikiMacroParameterClass[0]

Parameter type

...	...	@@ -1,1 +1,1 @@
1		-Unknown
	1	+Wiki

XWiki.WikiMacroParameterClass[1]

Parameter type

...	...	@@ -1,1 +1,1 @@
1		-Unknown
	1	+Wiki