Skip to Content
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 3.5
edited by Ryan C
on 2025/07/17 05:39
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,11 +1,11 @@
1 -{{groovy bindings="tags,max"}}
2 -def includeTags = tags?.split(',')*.trim()*.toLowerCase() ?: []
3 -def maxCount = max?.toInteger() ?: 999
1 +{{groovy bindings="tags"}}
2 +def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
3 +def maxCount = 100
4 4  
5 5  def hql = """
6 - select doc.fullName
7 - from XWikiDocument doc, BaseObject obj
8 - where obj.name = doc.fullName
6 + select doc.fullName
7 + from XWikiDocument doc, BaseObject obj
8 + where obj.name = doc.fullName
9 9   and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass'
10 10   order by doc.date desc
11 11  """
... ... @@ -14,13 +14,10 @@
14 14  def results = []
15 15  
16 16  docs.each { docName ->
17 - if (results.size() >= maxCount) return
18 -
19 19   def doc = xwiki.getDocument(docName)
20 20   def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
21 21   if (!obj) return
22 22  
23 - // extract fields
24 24   def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
25 25   def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
26 26   def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
... ... @@ -28,10 +28,9 @@
28 28  
29 29   if (!title || !summary) return
30 30  
31 - // tag filtering
32 32   if (includeTags && tagList) {
33 - def tagNames = tagList.collect { it.toString().toLowerCase() }
34 - if (!tagNames.any { includeTags.contains(it) }) return
29 + def docTags = tagList.collect { it.toString().toLowerCase() }
30 + if (!docTags.any { includeTags.contains(it) }) return
35 35   }
36 36  
37 37   def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
... ... @@ -62,7 +62,7 @@
62 62  
63 63  if (results.isEmpty()) {
64 64   if (includeTags) {
65 - println "⚠️ No incidents found for tags: ${parameters.tags}"
61 + println "⚠️ No incidents found with selected tag(s): ${tags}"
66 66   } else {
67 67   println "⚠️ No incidents to display."
68 68   }
Macro content availability
... ... @@ -1,0 +1,1 @@
1 +No content
Supports inline mode
... ... @@ -1,0 +1,1 @@
1 +Yes
XWiki.WikiMacroParameterClass[0]
Parameter description
... ... @@ -1,1 +1,1 @@
1 -Comma-separated tag filters
1 +Categorize by tag
Parameter mandatory
... ... @@ -1,0 +1,1 @@
1 +No
Parameter type
... ... @@ -1,0 +1,1 @@
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