Changes for page IncidentGallery

Summary

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

Details

XWiki.WikiMacroClass[0]

Macro code

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