Changes for page IncidentGallery

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

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

XWiki.WikiMacroParameterClass[0]

Parameter description

...	...	@@ -1,1 +1,0 @@
1		-Comma-separated tag filters

Parameter mandatory

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

Parameter name

...	...	@@ -1,1 +1,0 @@
1		-tags

Parameter type

...	...	@@ -1,1 +1,0 @@
1		-Wiki

XWiki.WikiMacroParameterClass[1]

Parameter description

...	...	@@ -1,1 +1,0 @@
1		-Max number of returned incidents

Parameter mandatory

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

Parameter name

...	...	@@ -1,1 +1,0 @@
1		-max

Parameter type

...	...	@@ -1,1 +1,0 @@
1		-Wiki