Изменения документа Приказы

Сводка

• Свойства страницы (1 изменено, 0 добавлено, 0 удалено)

Подробности

Свойства страницы

Содержимое

...	...	@@ -4,15 +4,24 @@
4	4	#foreach($pubRef in $pubRefs)
5	5	#set($pub = $xwiki.getDocument($pubRef))
6	6	#set($title = $pub.getTitle())
7		- #set($dateStr = $title.substring(10, 20))
8		- #set($date = $datetool.toDate("dd.MM.yyyy", $dateStr))
9		- #set($map = {"date": $date, "ref": $pubRef})
10		- #set($discard = $entries.add($map))
	7	+ ##set($dateStr = $title.substring(10, 20))
	8	+ #set($start = $title.indexOf("от ") + 3)
	9	+ #set($end = $title.indexOf(" №"))
	10	+ #if($start >= 0 && $end > $start)
	11	+ #set($dateStr = $title.substring($start, $end))
	12	+ #set($date = $datetool.toDate("dd.MM.yyyy", $dateStr))
	13	+ #set($map = {"date": $date, "ref": $pubRef, "doc": $pub})
	14	+ #set($discard = $entries.add($map))
	15	+ #end
11	11	#end
12	12	#foreach($entry in $collectiontool.sort($entries, "date:desc"))
13	13	#set($pubRef = $entry.ref)
14		- #set($pub = $xwiki.getDocument($pubRef))
	19	+ #set($pub = $entry.doc)
15	15	#set($title = $pub.getTitle())
16		- * [[$title>>$pubRef]]
	21	+ #set($content = $pub.getContent())
	22	+ #set($firstParagraph = $stringtool.substringBefore($content, "{"))
	23	+ * [[**$title**>>$pubRef]]
	24	+ $firstParagraph
	25	+
17	17	#end
18	18	{{/velocity}}