Skip to Content
0 Votes

Changes for page IncidentGallery

Last modified by Ryan C on 2025/07/17 06:41
From version 4.1
edited by Ryan C
on 2025/07/17 05:41
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,17 +1,15 @@
1 -{{groovy bindings="tags"}}
2 -def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
3 -def maxCount = 100
1 +{{groovy}}
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 17   def doc = xwiki.getDocument(docName)
... ... @@ -21,19 +21,17 @@
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 - 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://"))
34 34   def linkTarget = isValidURL ? externalURL : "doc:${docName}"
28 +
29 + // ✅ Escape brackets in title to avoid wiki breakage
35 35   def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
36 36  
32 + // ✅ Auto-detect first attached image
37 37   def imageFile = doc.getAttachmentList()?.find {
38 38   it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
39 39   }?.filename
... ... @@ -44,24 +44,20 @@
44 44   }
45 45  
46 46   def block = """
47 - (% style="margin-bottom:20px; width:100%" %)
48 - |${imageMarkup}|
43 +(% style="margin-bottom:20px; width:100%" %)
44 +|${imageMarkup}|
49 49  
50 - === [[${safeTitle}>>${linkTarget}]] ===
46 +=== [[${safeTitle}>>${linkTarget}]] ===
51 51  
52 - ${summary}
53 - [[Read More>>${linkTarget}]]
54 - """.trim()
48 +${summary}
49 +[[Read More>>${linkTarget}]]
50 +""".trim()
55 55  
56 56   results << block
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 - }
56 + println "⚠️ Still no incident blocks rendered — ensure at least one page has valid title/summary/attachment."
65 65  } else {
66 66   println results.join("\n\n")
67 67  }
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,0 +1,1 @@
1 +tags
Parameter hidden
... ... @@ -1,0 +1,1 @@
1 +No
Parameter mandatory
... ... @@ -1,0 +1,1 @@
1 +No
Parameter name
... ... @@ -1,0 +1,1 @@
1 +tags
Parameter type
... ... @@ -1,0 +1,1 @@
1 +Wiki