Changes for page IncidentGallery

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

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