Changes for page IncidentGallery

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,15 +1,18 @@
1	1	{{groovy}}
2		-def results = []
	2	+def tags = binding.variables['tags']
	3	+def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
3	3
	5	+def maxCount = 100
4	4	def hql = """
5		- select doc.fullName
6		- from XWikiDocument doc, BaseObject obj
7		- where obj.name = doc.fullName
	7	+ select doc.fullName
	8	+ from XWikiDocument doc, BaseObject obj
	9	+ where obj.name = doc.fullName
8	8	and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass'
9	9	order by doc.date desc
10	10	"""
11	11
12		-def docs = xwiki.search(hql, 100, 0)
	14	+def docs = xwiki.search(hql, maxCount, 0)
	15	+def results = []
13	13
14	14	docs.each { docName ->
15	15	def doc = xwiki.getDocument(docName)
...	...	@@ -19,17 +19,19 @@
19	19	def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
20	20	def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
21	21	def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
	25	+ def tagList = obj.getProperty("tags")?.value
22	22
23	23	if (!title || !summary) return
24	24
25		- // ✅ Choose external link if valid, otherwise link to doc
26		- def isValidURL = externalURL && (externalURL.startsWith("http://") || externalURL.startsWith("https://"))
27		- def linkTarget = isValidURL ? externalURL : "doc:${docName}"
	29	+ if (includeTags && tagList instanceof List) {
	30	+ def docTags = tagList.collect { it.toString().toLowerCase() }
	31	+ if (!docTags.any { includeTags.contains(it) }) return
	32	+ }
28	28
29		- // ✅ Escape brackets in title to avoid wiki breakage
	34	+ def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
	35	+ def linkTarget = isValidURL ? externalURL : "doc:${docName}"
30	30	def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
31	31
32		- // ✅ Auto-detect first attached image
33	33	def imageFile = doc.getAttachmentList()?.find {
34	34	it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
35	35	}?.filename
...	...	@@ -40,20 +40,24 @@
40	40	}
41	41
42	42	def block = """
43		-(% style="margin-bottom:20px; width:100%" %)
44		-|${imageMarkup}|
	48	+ (% style="margin-bottom:20px; width:100%" %)
	49	+ |${imageMarkup}|
45	45
46		-=== [[${safeTitle}>>${linkTarget}]] ===
	51	+ === [[${safeTitle}>>${linkTarget}]] ===
47	47
48		-${summary}
49		-[[Read More>>${linkTarget}]]
50		-""".trim()
	53	+ ${summary}
	54	+ [[Read More>>${linkTarget}]]
	55	+ """.trim()
51	51
52	52	results << block
53	53	}
54	54
55	55	if (results.isEmpty()) {
56		- println "⚠️ Still no incident blocks rendered — ensure at least one page has valid title/summary/attachment."
	61	+ if (includeTags) {
	62	+ println "⚠️ No incidents found with selected tag(s): ${tags}"
	63	+ } else {
	64	+ println "⚠️ No incidents to display."
	65	+ }
57	57	} else {
58	58	println results.join("\n\n")
59	59	}

Macro content availability

...	...	@@ -1,1 +1,0 @@
1		-No content

XWiki.WikiMacroParameterClass[0]

Parameter advanced

...	...	@@ -1,1 +1,1 @@
1		-Yes
	1	+No

Parameter default value

...	...	@@ -1,1 +1,0 @@
1		-Job Discrimination

Parameter description

...	...	@@ -1,1 +1,1 @@
1		-tags
	1	+Categorize by tag

Parameter type

...	...	@@ -1,1 +1,1 @@
1		-Wiki
	1	+java.util.List<macros.IncidentTag>