0 Votes

Changes for page IncidentGallery

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

From version 2.4
edited by Ryan C
on 2025/07/17 04:59
Change comment: There is no comment for this version
To version 2.14
edited by Ryan C
on 2025/07/17 05:04
Change comment: There is no comment for this version

Summary

Details

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