Wijzigen voor document GetAnnouncements
Laatst gewijzigd door Afgeschermd op 03-04-2017 01:41:55
gewijzigd door Mark van den Broek (Admin)
op 30-12-2016 19:29:47
op 30-12-2016 19:29:47
gewijzigd door Mark van den Broek (Admin)
op 30-12-2016 19:35:52
op 30-12-2016 19:35:52
Opmerking bij wijziging:
Er is geen opmerking bij deze versie
Samenvatting
-
Paginaeigenschappen (1 gewijzigd, 0 toegevoegd, 0 verwijderd)
Details
- Paginaeigenschappen
-
- Inhoud
-
... ... @@ -4,7 +4,6 @@ 4 4 #end 5 5 ## Get date 6 6 #set($now = $datetool.format("dd-MM-yyyy HH:mm:ss:SSS", $datetool.getDate())) 7 -Now: $now 8 8 ## Get the appropriate announcements 9 9 #set($annClass = "360AnnouncementCode.AnnouncementClass") 10 10 #if("$!{request.wikiId}" != "") ... ... @@ -27,7 +27,6 @@ 27 27 ##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()) 28 28 #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") 29 29 #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()) 30 -annDocResults: $annDocResults 31 31 #set($discard = $announcementMessage.put('numberOfAnnouncements', $annDocResults.size())) 32 32 #if($annDocResults.size()) 33 33 #set($announcements = []) ... ... @@ -35,7 +35,6 @@ 35 35 #set($announcement = {}) 36 36 #set($annDoc = $xwiki.getDocument($annResult)) 37 37 #foreach($annObj in $annDoc.getObjects($annClass)) 38 - $annObj.language 39 39 #if($annObj.language == $language) 40 40 #set($discard = $announcement.put('shortHeader', $annObj.shortHeader)) 41 41 #set($discard = $announcement.put('fullAnnouncement', $annObj.fullAnnouncement)) ... ... @@ -43,7 +43,7 @@ 43 43 #end 44 44 #end 45 45 #end 46 - #set($discard = $announcementMessage.put($announcements)) 43 + #set($discard = $announcementMessage.put('announcements', $announcements)) 47 47 #end 48 -$announcementMessage 45 +$jsontool.serialize(${announcementMessage}) 49 49 {{/velocity}}