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