Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -21,7 +21,7 @@
21	21	#set($discard = $xwiki.getDocument($firstEntry))
22	22	#getEntryObject($discard $entryObj)
23	23	#getEntryDate($discard $entryObj $firstYear)
24		- #set($firstYear = $mathtool.toInteger($xwiki.formatDate($firstYear, 'yyyy')))
	24	+ #set($firstYear = $numbertool.toNumber($xwiki.formatDate($firstYear, 'yyyy')).intValue())
25	25	#end
26	26	#set ($lastYearQueryObj = $services.query.hql("${query} order by year(publishDate.value) desc").setLimit(1).addFilter('unique'))
27	27	#bindQueryParameters($lastYearQueryObj $queryParams)
...	...	@@ -29,7 +29,7 @@
29	29	#set($discard = $xwiki.getDocument($lastEntry))
30	30	#getEntryObject($discard $entryObj)
31	31	#getEntryDate($discard $entryObj $lastYear)
32		- #set($lastYear = $mathtool.toInteger($xwiki.formatDate($lastYear, 'yyyy')))
	32	+ #set($lastYear = $numbertool.toNumber($xwiki.formatDate($lastYear, 'yyyy')).intValue())
33	33	#end
34	34	#if("$!{firstYear}" != '') ## At least one entry exists
35	35	#foreach($year in [$firstYear..$lastYear])
...	...	@@ -65,7 +65,7 @@
65	65	#set ($discard = $queryParams.put('creator', $xcontext.user))
66	66	#set ($query = "$!{query} and (doc.creator = :creator or (isPublished.value = 1 and hidden.value = 0))")
67	67	#set($query = "${query} and year(publishDate.value) = :year")
68		- #set ($discard = $queryParams.put('year', $mathtool.toInteger($year)))
	68	+ #set ($discard = $queryParams.put('year', $numbertool.toNumber($year).intValue()))
69	69	## Create a Jodatime date formatter that will be used to format dates
70	70	#set($monthFormatter = $xwiki.jodatime.getDateTimeFormatterForPattern('MMMM'))
71	71	#set($tempDate = $xwiki.jodatime.mutableDateTime)
...	...	@@ -103,15 +103,15 @@
103	103	#macro(displayBlogMonthArchive $targetDocument $year $month)
104	104	#set($dateFormatter = $xwiki.jodatime.getDateTimeFormatterForPattern('MMMM yyyy'))
105	105	#set($tempDate = $xwiki.jodatime.mutableDateTime)
106		- $tempDate.setYear($mathtool.toInteger($year))##
107		- $tempDate.setMonthOfYear($mathtool.toInteger($month))##
	106	+ #set($discard = $tempDate.setYear($numbertool.toNumber($year).intValue()))
	107	+ #set($discard = $tempDate.setMonthOfYear($numbertool.toNumber($month).intValue()))
108	108	#displayBlogMonthArchiveSubTitle($targetDocument $tempDate)
109	109	#getAllBlogPostsQueryBasedOnDisplayContext($targetDocument $query $queryParams)
110	110	#set ($discard = $queryParams.put('creator', $xcontext.user))
111	111	#set ($query = "$!{query} and (doc.creator = :creator or (isPublished.value = 1 and hidden.value = 0))")
112	112	#set($query = "${query} and year(publishDate.value) = :year and month(publishDate.value) = :month")
113		- #set ($discard = $queryParams.put('year', $mathtool.toInteger($year)))
114		- #set ($discard = $queryParams.put('month', $mathtool.toInteger($month)))
	113	+ #set ($discard = $queryParams.put('year', $numbertool.toNumber($year).intValue()))
	114	+ #set ($discard = $queryParams.put('month', $numbertool.toNumber($month).intValue()))
115	115	#set ($monthArticleCountQueryObj = $services.query.hql($query).addFilter('unique'))
116	116	#bindQueryParameters($monthArticleCountQueryObj $queryParams)
117	117	#set($monthArticleCount = $monthArticleCountQueryObj.count())
...	...	@@ -194,8 +194,8 @@
194	194	##
195	195	##
196	196	##
197		-#set ($month = "$!{mathtool.toInteger($request.month)}")
198		-#set ($year = "$!{mathtool.toInteger($request.year)}")
	197	+#set ($month = "$!numbertool.toNumber($request.month).intValue()")
	198	+#set ($year = "$!numbertool.toNumber($request.year).intValue()")
199	199	#if ($year == '')
200	200	## Show a brief history of the blog, a tree with first level = years, second level = months, and the number of entries from that year/month in every node.
201	201	#displayBlogFullArchive($doc)