... |
... |
@@ -1,16 +1,11 @@ |
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() ?: [] |
|
2 |
+def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it } |
8 |
8 |
def maxCount = max?.toInteger() ?: 999 |
9 |
9 |
|
10 |
10 |
def hql = """ |
11 |
|
- select doc.fullName |
12 |
|
- from XWikiDocument doc, BaseObject obj |
13 |
|
- where obj.name = doc.fullName |
|
6 |
+ select doc.fullName |
|
7 |
+ from XWikiDocument doc, BaseObject obj |
|
8 |
+ where obj.name = doc.fullName |
14 |
14 |
and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass' |
15 |
15 |
order by doc.date desc |
16 |
16 |
""" |
... |
... |
@@ -25,7 +25,6 @@ |
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() |
... |
... |
@@ -33,7 +33,6 @@ |
33 |
33 |
|
34 |
34 |
if (!title || !summary) return |
35 |
35 |
|
36 |
|
- // tag filtering |
37 |
37 |
if (includeTags && tagList) { |
38 |
38 |
def tagNames = tagList.collect { it.toString().toLowerCase() } |
39 |
39 |
if (!tagNames.any { includeTags.contains(it) }) return |
... |
... |
@@ -67,7 +67,7 @@ |
67 |
67 |
|
68 |
68 |
if (results.isEmpty()) { |
69 |
69 |
if (includeTags) { |
70 |
|
- println "⚠️ No incidents found for tags: ${parameters.tags}" |
|
63 |
+ println "⚠️ No incidents found for tags: ${tags}" |
71 |
71 |
} else { |
72 |
72 |
println "⚠️ No incidents to display." |
73 |
73 |
} |