... |
... |
@@ -1,11 +1,12 @@ |
1 |
|
-{{groovy bindings="tags"}} |
2 |
|
-def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it } |
3 |
|
-def maxCount = 100 |
|
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 |
4 |
4 |
|
|
5 |
+ |
5 |
5 |
def hql = """ |
6 |
|
- select doc.fullName |
7 |
|
- from XWikiDocument doc, BaseObject obj |
8 |
|
- where obj.name = doc.fullName |
|
7 |
+ select doc.fullName |
|
8 |
+ from XWikiDocument doc, BaseObject obj |
|
9 |
+ 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 |
""" |
... |
... |
@@ -14,10 +14,13 @@ |
14 |
14 |
def results = [] |
15 |
15 |
|
16 |
16 |
docs.each { docName -> |
|
18 |
+ if (results.size() >= maxCount) return |
|
19 |
+ |
17 |
17 |
def doc = xwiki.getDocument(docName) |
18 |
18 |
def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass") |
19 |
19 |
if (!obj) return |
20 |
20 |
|
|
24 |
+ // extract fields |
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() |
... |
... |
@@ -25,10 +25,10 @@ |
25 |
25 |
|
26 |
26 |
if (!title || !summary) return |
27 |
27 |
|
28 |
|
- // Apply tag filter if tags are selected |
|
32 |
+ // tag filtering |
29 |
29 |
if (includeTags && tagList) { |
30 |
|
- def docTags = tagList.collect { it.toString().toLowerCase() } |
31 |
|
- if (!docTags.any { includeTags.contains(it) }) return |
|
34 |
+ def tagNames = tagList.collect { it.toString().toLowerCase() } |
|
35 |
+ if (!tagNames.any { includeTags.contains(it) }) return |
32 |
32 |
} |
33 |
33 |
|
34 |
34 |
def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://") |
... |
... |
@@ -59,7 +59,7 @@ |
59 |
59 |
|
60 |
60 |
if (results.isEmpty()) { |
61 |
61 |
if (includeTags) { |
62 |
|
- println "⚠️ No incidents found with selected tag(s): ${tags}" |
|
66 |
+ println "⚠️ No incidents found for tags: ${parameters.tags}" |
63 |
63 |
} else { |
64 |
64 |
println "⚠️ No incidents to display." |
65 |
65 |
} |