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.5
edited by Ryan C
on 2025/07/17 05:48
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,80 +1,70 @@
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 -def maxCount = max?.toInteger() ?: 999
3 +def maxCount = 100
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 + def doc = xwiki.getDocument(docName)
18 + def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
19 + if (!obj) return
20 20  
21 - docs.each { docName ->
22 - if (results.size() >= maxCount) return
21 + def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
22 + def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
23 + def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
24 + def tagList = obj.getProperty("tags")?.value
23 23  
24 - def doc = xwiki.getDocument(docName)
25 - def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
26 - if (!obj) return
26 + if (!title || !summary) return
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 + // ✅ Apply tag filtering if tags were provided
29 + if (includeTags && tagList instanceof List) {
30 + def docTags = tagList.collect { it.toString().toLowerCase() }
31 + if (!docTags.any { includeTags.contains(it) }) return
32 + }
32 32  
33 - if (!title || !summary) return
34 + def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
35 + def linkTarget = isValidURL ? externalURL : "doc:${docName}"
36 + def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
34 34  
35 - if (includeTags && tagList) {
36 - def tagNames = tagList.collect { it.toString().toLowerCase() }
37 - if (!tagNames.any { includeTags.contains(it) }) return
38 - }
38 + def imageFile = doc.getAttachmentList()?.find {
39 + it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
40 + }?.filename
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 imageMarkup = ""
43 + if (imageFile) {
44 + imageMarkup = "[[image:${doc.fullName}@${imageFile}||alt=\"Image\" data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]"
45 + }
43 43  
44 - def imageFile = doc.getAttachmentList()?.find {
45 - it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
46 - }?.filename
47 + def block = """
48 + (% style="margin-bottom:20px; width:100%" %)
49 + |${imageMarkup}|
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 - }
51 + === [[${safeTitle}>>${linkTarget}]] ===
52 52  
53 - def block = """
54 - (% style="margin-bottom:20px; width:100%" %)
55 - |${imageMarkup}|
53 + ${summary}
54 + [[Read More>>${linkTarget}]]
55 + """.trim()
56 56  
57 - === [[${safeTitle}>>${linkTarget}]] ===
57 + results << block
58 +}
58 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 - }
60 +if (results.isEmpty()) {
61 + if (includeTags) {
62 + println "⚠️ No incidents found with selected tag(s): ${tags}"
72 72   } else {
73 - println results.join("\n\n")
64 + println "⚠️ No incidents to display."
74 74   }
66 +} else {
67 + 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  
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]