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