Changes for page IncidentGallery

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

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