Skip to Content
0 Votes

Changes for page IncidentGallery

Last modified by Ryan C on 2025/07/17 06:41
From version 2.1
edited by Ryan C
on 2025/07/17 04:52
Change comment: There is no comment for this version
To version 3.3
edited by Ryan C
on 2025/07/17 05:37
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,16 +1,11 @@
1 -{{groovy}}
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 = parameters.tags?.split(',')*.trim()*.toLowerCase() ?: []
8 -def maxCount = parameters.max?.toInteger() ?: 999
1 +{{groovy bindings="tags"}}
2 +def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
3 +def maxCount = 100
9 9  
10 10  def hql = """
11 - select doc.fullName
12 - from XWikiDocument doc, BaseObject obj
13 - where obj.name = doc.fullName
6 + select doc.fullName
7 + from XWikiDocument doc, BaseObject obj
8 + where obj.name = doc.fullName
14 14   and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass'
15 15   order by doc.date desc
16 16  """
... ... @@ -19,13 +19,10 @@
19 19  def results = []
20 20  
21 21  docs.each { docName ->
22 - if (results.size() >= maxCount) return
23 -
24 24   def doc = xwiki.getDocument(docName)
25 25   def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
26 26   if (!obj) return
27 27  
28 - // extract fields
29 29   def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
30 30   def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
31 31   def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
... ... @@ -33,10 +33,10 @@
33 33  
34 34   if (!title || !summary) return
35 35  
36 - // tag filtering
28 + // Apply tag filter if tags are selected
37 37   if (includeTags && tagList) {
38 - def tagNames = tagList.collect { it.toString().toLowerCase() }
39 - if (!tagNames.any { includeTags.contains(it) }) return
30 + def docTags = tagList.collect { it.toString().toLowerCase() }
31 + if (!docTags.any { includeTags.contains(it) }) return
40 40   }
41 41  
42 42   def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
... ... @@ -67,7 +67,7 @@
67 67  
68 68  if (results.isEmpty()) {
69 69   if (includeTags) {
70 - println "⚠️ No incidents found for tags: ${parameters.tags}"
62 + println "⚠️ No incidents found with selected tag(s): ${tags}"
71 71   } else {
72 72   println "⚠️ No incidents to display."
73 73   }
Macro content availability
... ... @@ -1,0 +1,1 @@
1 +No content
Macro description
... ... @@ -1,1 +1,1 @@
1 - Displays a gallery of anti-White incidents, with optional tag filter
1 +Displays a gallery of anti-White incidents, with optional tag filter
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