0 Votes

Changes for page IncidentGallery

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

From version 3.4
edited by Ryan C
on 2025/07/17 05:38
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,7 +1,4 @@
1 -{{groovy bindings="tags"}}
2 -def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
3 -def maxCount = 100
4 -
1 +{{groovy}}
5 5  def hql = """
6 6   select doc.fullName
7 7   from XWikiDocument doc, BaseObject obj
... ... @@ -10,7 +10,7 @@
10 10   order by doc.date desc
11 11  """
12 12  
13 -def docs = xwiki.search(hql, maxCount, 0)
10 +def docs = xwiki.search(hql, 100, 0)
14 14  def results = []
15 15  
16 16  docs.each { docName ->
... ... @@ -21,15 +21,9 @@
21 21   def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
22 22   def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
23 23   def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
24 - def tagList = obj.getProperty("tags")?.value
25 25  
26 26   if (!title || !summary) return
27 27  
28 - if (includeTags && tagList) {
29 - def docTags = tagList.collect { it.toString().toLowerCase() }
30 - if (!docTags.any { includeTags.contains(it) }) return
31 - }
32 -
33 33   def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
34 34   def linkTarget = isValidURL ? externalURL : "doc:${docName}"
35 35   def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
... ... @@ -57,11 +57,7 @@
57 57  }
58 58  
59 59  if (results.isEmpty()) {
60 - if (includeTags) {
61 - println "⚠️ No incidents found with selected tag(s): ${tags}"
62 - } else {
63 - println "⚠️ No incidents to display."
64 - }
51 + println "⚠️ No incidents to display."
65 65  } else {
66 66   println results.join("\n\n")
67 67  }