0 Votes

Changes for page IncidentGallery

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

From version 2.16
edited by Ryan C
on 2025/07/17 05:07
Change comment: There is no comment for this version
To version 2.11
edited by Ryan C
on 2025/07/17 05:03
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,11 +1,12 @@
1 -{{groovy}}
2 -def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
3 -def maxCount = max?.toInteger() ?: 999
1 +{{groovy bindings="tags,max"}}
2 +def includeTags = (context.macro.params.tags ?: "").split(',')*.trim()*.toLowerCase().findAll { it } // removes blanks
3 +def maxCount = context.macro.params.max?.toInteger() ?: 999
4 4  
5 +
5 5  def hql = """
6 - select doc.fullName
7 - from XWikiDocument doc, BaseObject obj
8 - where obj.name = doc.fullName
7 + select doc.fullName
8 + from XWikiDocument doc, BaseObject obj
9 + 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  """
... ... @@ -20,6 +20,7 @@
20 20   def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
21 21   if (!obj) return
22 22  
24 + // extract fields
23 23   def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
24 24   def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
25 25   def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
... ... @@ -27,6 +27,7 @@
27 27  
28 28   if (!title || !summary) return
29 29  
32 + // tag filtering
30 30   if (includeTags && tagList) {
31 31   def tagNames = tagList.collect { it.toString().toLowerCase() }
32 32   if (!tagNames.any { includeTags.contains(it) }) return
... ... @@ -60,7 +60,7 @@
60 60  
61 61  if (results.isEmpty()) {
62 62   if (includeTags) {
63 - println "⚠️ No incidents found for tags: ${tags}"
66 + println "⚠️ No incidents found for tags: ${parameters.tags}"
64 64   } else {
65 65   println "⚠️ No incidents to display."
66 66   }
XWiki.WikiMacroParameterClass[0]
Parameter type
... ... @@ -1,1 +1,1 @@
1 -Wiki
1 +Unknown
XWiki.WikiMacroParameterClass[1]
Parameter type
... ... @@ -1,1 +1,1 @@
1 -Wiki
1 +Unknown