Skip to Content
0 Votes

Changes for page IncidentGallery

Last modified by Ryan C on 2025/07/17 06:41
From version 2.3
edited by Ryan C
on 2025/07/17 04:57
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,11 +1,5 @@
1 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 = tags?.split(',')*.trim()*.toLowerCase() ?: []
8 -def maxCount = max?.toInteger() ?: 999
2 +def results = []
9 9  
10 10  def hql = """
11 11   select doc.fullName
... ... @@ -15,34 +15,27 @@
15 15   order by doc.date desc
16 16  """
17 17  
18 -def docs = xwiki.search(hql, maxCount, 0)
19 -def results = []
12 +def docs = xwiki.search(hql, 100, 0)
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()
32 - def tagList = obj.getProperty("tags")?.value
33 33  
34 34   if (!title || !summary) return
35 35  
36 - // tag filtering
37 - if (includeTags && tagList) {
38 - def tagNames = tagList.collect { it.toString().toLowerCase() }
39 - if (!tagNames.any { includeTags.contains(it) }) return
40 - }
41 -
42 - 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://"))
43 43   def linkTarget = isValidURL ? externalURL : "doc:${docName}"
28 +
29 + // ✅ Escape brackets in title to avoid wiki breakage
44 44   def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
45 45  
32 + // ✅ Auto-detect first attached image
46 46   def imageFile = doc.getAttachmentList()?.find {
47 47   it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
48 48   }?.filename
... ... @@ -53,24 +53,20 @@
53 53   }
54 54  
55 55   def block = """
56 - (% style="margin-bottom:20px; width:100%" %)
57 - |${imageMarkup}|
43 +(% style="margin-bottom:20px; width:100%" %)
44 +|${imageMarkup}|
58 58  
59 - === [[${safeTitle}>>${linkTarget}]] ===
46 +=== [[${safeTitle}>>${linkTarget}]] ===
60 60  
61 - ${summary}
62 - [[Read More>>${linkTarget}]]
63 - """.trim()
48 +${summary}
49 +[[Read More>>${linkTarget}]]
50 +""".trim()
64 64  
65 65   results << block
66 66  }
67 67  
68 68  if (results.isEmpty()) {
69 - if (includeTags) {
70 - println "⚠️ No incidents found for tags: ${parameters.tags}"
71 - } else {
72 - println "⚠️ No incidents to display."
73 - }
56 + println "⚠️ Still no incident blocks rendered — ensure at least one page has valid title/summary/attachment."
74 74  } else {
75 75   println results.join("\n\n")
76 76  }
Macro content availability
... ... @@ -1,0 +1,1 @@
1 +No content
Supports inline mode
... ... @@ -1,0 +1,1 @@
1 +Yes
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
Parameter mandatory
... ... @@ -1,0 +1,1 @@
1 +No
Parameter type
... ... @@ -1,0 +1,1 @@
1 +Wiki
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
Macros.AntiWhiteTagClass.WebHome[0]