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 2.2
edited by Ryan C
on 2025/07/17 04:56
Change comment: There is no comment for this version

Summary

Details

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