Skip to Content
0 Votes

Changes for page IncidentGallery

Last modified by Ryan C on 2025/07/17 06:41
From version 2.12
edited by Ryan C
on 2025/07/17 05:04
Change comment: There is no comment for this version
To version 4.8
edited by Ryan C
on 2025/07/17 05:51
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,8 +1,6 @@
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
1 +{{groovy}}
2 +def results = []
4 4  
5 -
6 6  def hql = """
7 7   select doc.fullName
8 8   from XWikiDocument doc, BaseObject obj
... ... @@ -11,34 +11,27 @@
11 11   order by doc.date desc
12 12  """
13 13  
14 -def docs = xwiki.search(hql, maxCount, 0)
15 -def results = []
12 +def docs = xwiki.search(hql, 100, 0)
16 16  
17 17  docs.each { docName ->
18 - if (results.size() >= maxCount) return
19 -
20 20   def doc = xwiki.getDocument(docName)
21 21   def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
22 22   if (!obj) return
23 23  
24 - // extract fields
25 25   def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
26 26   def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
27 27   def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
28 - def tagList = obj.getProperty("tags")?.value
29 29  
30 30   if (!title || !summary) return
31 31  
32 - // tag filtering
33 - if (includeTags && tagList) {
34 - def tagNames = tagList.collect { it.toString().toLowerCase() }
35 - if (!tagNames.any { includeTags.contains(it) }) return
36 - }
37 -
38 - def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
25 + // ✅ Choose external link if valid, otherwise link to doc
26 + def isValidURL = externalURL && (externalURL.startsWith("http://") || externalURL.startsWith("https://"))
39 39   def linkTarget = isValidURL ? externalURL : "doc:${docName}"
28 +
29 + // ✅ Escape brackets in title to avoid wiki breakage
40 40   def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
41 41  
32 + // ✅ Auto-detect first attached image
42 42   def imageFile = doc.getAttachmentList()?.find {
43 43   it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
44 44   }?.filename
... ... @@ -49,24 +49,20 @@
49 49   }
50 50  
51 51   def block = """
52 - (% style="margin-bottom:20px; width:100%" %)
53 - |${imageMarkup}|
43 +(% style="margin-bottom:20px; width:100%" %)
44 +|${imageMarkup}|
54 54  
55 - === [[${safeTitle}>>${linkTarget}]] ===
46 +=== [[${safeTitle}>>${linkTarget}]] ===
56 56  
57 - ${summary}
58 - [[Read More>>${linkTarget}]]
59 - """.trim()
48 +${summary}
49 +[[Read More>>${linkTarget}]]
50 +""".trim()
60 60  
61 61   results << block
62 62  }
63 63  
64 64  if (results.isEmpty()) {
65 - if (includeTags) {
66 - println "⚠️ No incidents found for tags: ${parameters.tags}"
67 - } else {
68 - println "⚠️ No incidents to display."
69 - }
56 + println "⚠️ Still no incident blocks rendered — ensure at least one page has valid title/summary/attachment."
70 70  } else {
71 71   println results.join("\n\n")
72 72  }
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]