Wijzigen voor document GetAnnouncements

Samenvatting

• Paginaeigenschappen (1 gewijzigd, 0 toegevoegd, 0 verwijderd)

Details

Paginaeigenschappen

Inhoud

...	...	@@ -2,20 +2,24 @@
2	2	#if("$!{request.xpage}" == 'plain')
3	3	$response.setContentType('application/json')
4	4	#end
5		-## Initialize
6		-#set($annClass = "360AnnouncementCode.AnnouncementClass")
	5	+## Get date
7	7	#set($now = $datetool.toDate('yyyyMMddHHmmssSSS', $datetool.getDate()))
8		-#set($language = "nl")
9		-#set($wikiid = "%")
10	10	## Get the appropriate announcements
	8	+#set($annClass = "360AnnouncementCode.AnnouncementClass")
11	11	#if("$!{request.wikiId}" != "")
12	12	#set($wikiid = "%${request.wikiId}%")
	11	+#else
	12	+ #set($wikiid = "%")
13	13	#end
14	14	#if("$!{request.language}" != "")
15	15	#set($language = ${request.language})
	16	+#else
	17	+ #set($language = "nl")
16	16	#end
17	17	#set($announcementMessage = {})
18		-#set($xwq = "from doc.object(${annClass}) as announcement where (announcement.publishOnWikis LIKE :wikis or announcement.publishOnWikis = '') and announcement.language = :lang and announcement.startDate <= :startdate and announcement.endDate >= :enddate order by doc.")
	20	+##set($xwq = "from doc.object('360AnnouncementCode.AnnouncementClass') as announcement where announcement.publishOnWikis LIKE :wikis and announcement.publicallyVisible = :forGuests and announcement.language = :lang and announcement.startDate >= :startdate and announcement.endDate <= :enddate")
	21	+##set($annDocResults = $services.query.xwql($xwq).bindValue("wikis", $wikiid).bindValue("forGuests", $publicallyVisible).bindValue("lang", $language).bindValue("startdate", $datetool.toDate('yyyy-MM-dd HH:mm:ss:SSS', $now)).bindValue("enddate", $datetool.toDate('yyyy-MM-dd HH:mm:ss:SSS', $now)).execute())
	22	+#set($xwq = "from doc.object('360AnnouncementCode.AnnouncementClass') as announcement where (announcement.publishOnWikis LIKE :wikis or announcement.publishOnWikis = '') and announcement.language = :lang and announcement.startDate <= :startdate and announcement.endDate >= :enddate")
19	19	#set($annDocResults = $services.query.xwql($xwq).bindValue("wikis", $wikiid).bindValue("lang", $language).bindValue("startdate", $datetool.toDate('yyyy-MM-dd HH:mm:ss:SSS', $now)).bindValue("enddate", $datetool.toDate('yyyy-MM-dd HH:mm:ss:SSS', $now)).execute())
20	20	#set($discard = $announcementMessage.put('numberOfAnnouncements', $annDocResults.size()))
21	21	#if($annDocResults.size())
...	...	@@ -24,10 +24,14 @@
24	24	#set($announcement = {})
25	25	#set($annDoc = $xwiki.getDocument($annResult))
26	26	#set($annObj = $annDoc.getObject($annClass, 'language', $language))
27		- #set($discard = $announcement.put('shortHeader', $annObj.shortHeader))
28		- #set($discard = $announcement.put('fullAnnouncement', $annObj.getProperty('fullAnnouncement').value))
29		- #set($discard = $announcement.put('publicallyVisible', $annObj.getProperty('publicallyVisible').value))
30		- #set($discard = $announcements.add($announcement))
	31	+## #foreach($annObj in $annDoc.getObjects($annClass))
	32	+## #if($annObj.language == $language)
	33	+ #set($discard = $announcement.put('shortHeader', $annObj.shortHeader))
	34	+ #set($discard = $announcement.put('fullAnnouncement', $annObj.getProperty('fullAnnouncement').value))
	35	+ #set($discard = $announcement.put('publicallyVisible', $annObj.getProperty('publicallyVisible').value))
	36	+ #set($discard = $announcements.add($announcement))
	37	+## #end
	38	+## #end
31	31	#end
32	32	#set($discard = $announcementMessage.put('announcements', $announcements))
33	33	#end