0 Votes

Changes for page IncidentGallery

Last modified by Ryan C on 2025/07/17 06:41

From version 2.15
edited by Ryan C
on 2025/07/17 05:05
Change comment: There is no comment for this version
To version 4.8
edited by Ryan C
on 2025/07/17 05:51
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,80 +1,61 @@
1 1  {{groovy}}
2 -def binding = binding
3 -def tags = binding.getVariable('tags')
4 -def max = binding.getVariable('max')
2 +def results = []
5 5  
6 -def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
7 -def maxCount = max?.toInteger() ?: 999
4 +def hql = """
5 + select doc.fullName
6 + from XWikiDocument doc, BaseObject obj
7 + where obj.name = doc.fullName
8 + and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass'
9 + order by doc.date desc
10 +"""
8 8  
12 +def docs = xwiki.search(hql, 100, 0)
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 - """
14 +docs.each { docName ->
15 + def doc = xwiki.getDocument(docName)
16 + def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
17 + if (!obj) return
17 17  
18 - def docs = xwiki.search(hql, maxCount, 0)
19 - def results = []
19 + def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
20 + def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
21 + def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
20 20  
21 - docs.each { docName ->
22 - if (results.size() >= maxCount) return
23 + if (!title || !summary) 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
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}"
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
29 + // ✅ Escape brackets in title to avoid wiki breakage
30 + def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
32 32  
33 - if (!title || !summary) return
32 + // ✅ Auto-detect first attached image
33 + def imageFile = doc.getAttachmentList()?.find {
34 + it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
35 + }?.filename
34 34  
35 - if (includeTags && tagList) {
36 - def tagNames = tagList.collect { it.toString().toLowerCase() }
37 - if (!tagNames.any { includeTags.contains(it) }) return
38 - }
37 + def imageMarkup = ""
38 + if (imageFile) {
39 + imageMarkup = "[[image:${doc.fullName}@${imageFile}||alt=\"Image\" data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]"
40 + }
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')
42 + def block = """
43 +(% style="margin-bottom:20px; width:100%" %)
44 +|${imageMarkup}|
43 43  
44 - def imageFile = doc.getAttachmentList()?.find {
45 - it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
46 - }?.filename
46 +=== [[${safeTitle}>>${linkTarget}]] ===
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 +${summary}
49 +[[Read More>>${linkTarget}]]
50 +""".trim()
52 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 - }
52 + results << block
75 75  }
76 76  
77 -// ✅ This is the actual macro parameter call
78 -render(tags, max)
55 +if (results.isEmpty()) {
56 + println "⚠️ Still no incident blocks rendered — ensure at least one page has valid title/summary/attachment."
57 +} else {
58 + println results.join("\n\n")
59 +}
79 79  {{/groovy}}
80 80  
XWiki.WikiMacroParameterClass[0]
Parameter advanced
... ... @@ -1,0 +1,1 @@
1 +Yes
Parameter default value
... ... @@ -1,0 +1,1 @@
1 +Job Discrimination
Parameter deprecated
... ... @@ -1,0 +1,1 @@
1 +No
Parameter description
... ... @@ -1,1 +1,1 @@
1 -Comma-separated tag filters
1 +tags
Parameter hidden
... ... @@ -1,0 +1,1 @@
1 +No
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
Macros.AntiWhiteTagClass.WebHome[0]