0 Votes

Changes for page IncidentGallery

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

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

Summary

Details

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