Changes for page Forthcoming

Summary

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

Details

Page properties

Content

...	...	@@ -1,22 +1,27 @@
1		-{{include reference="Events.Environment" excludeFirstHeading="true"/}}{{velocity}}
2		-##
3		-#if( !$userName || $userName == "" || !$userSpace || $userSpace == "" || !$userFullname || $userFullname == "" )
4		-## overall forthcoming events
5		- #set( $query = ", BaseObject objEvent, DateProperty as propDate
6		- where doc.fullName = objEvent.name and objEvent.className = '${objectSpace}.${objectClass}' and objEvent.name <> '${objectPool}.${objectTemplate}' and propDate.id.id = objEvent.id and propDate.name = 'start_date' and propDate.value > current_date() order by propDate.value asc " )
7		-#else
8		- #set( $query = ", BaseObject as objEvent, BaseObject as objRole, LargeStringProperty as propWho, DateProperty as propDate
9		- where objEvent.name = doc.fullName and objEvent.className = '${objectSpace}.${objectClass}' and objEvent.name <> '${objectPool}.${objectTemplate}' and propDate.id.id = objEvent.id and propDate.name = 'start_date' and propDate.value > current_date() and objRole.name = doc.fullName and objRole.className = '${objectSpace}.Roles.${objectClass}' and propWho.id.id = objRole.id and propWho.name = 'who' and propWho.value like '%$userName%' order by propDate.value asc " )
10		-#end
	1	+{{velocity}}
	2	+{{html clean="false" wiki="true"}}
	3	+#template('apice_macros.vm')
	4	+#setobjectspace("Events")
	5	+#template('apice_event_macros.vm')
	6	+#template('apice_user_param.vm')
	7	+## user forthcoming events
	8	+#set( $query = ", BaseObject as objEvent #if( $oneUser ), BaseObject as objRole, LargeStringProperty as propWho #end, DateProperty as propDate
	9	+ where objEvent.name = doc.fullName and objEvent.className = '${mainSpace}.Class' and objEvent.name <> '${objectPool}.Template' and propDate.id.id = objEvent.id and propDate.name = 'start_date' and propDate.value > current_date() #if( $oneUser ) and objRole.name = doc.fullName and objRole.className = '${mainSpace}.Roles.Class' and propWho.id.id = objRole.id and propWho.name = 'who' and propWho.value like '%$userName%' #end order by propDate.value asc " )
11	11	## execute query
12		-#set( $eventsFound = $xwiki.searchDocuments($query) )
	11	+#set( $itemFound = $xwiki.searchDocuments($query) )
13	13	##
14		-#if( $eventsFound.size() > 0 )
15		->$services.localization.render('forthcomingevents').toLowerCase()
16		-
17		- #foreach($event in $eventsFound)
18		- #set( $eventDoc = $xwiki.getDocument($event) )
19		-#if( !$foreach.first ){{themeTextSecondary}} • {{/themeTextSecondary}} #end#if( $eventDoc.getValue('sort') != 'special issue' ){{event short="true"}}$eventDoc{{/event}}#{else}{{event short="title" linked="title"}}$eventDoc{{/event}}#end #end
20		-(%%)
	13	+#if( $itemFound.size() > 0 )
	14	+<div class="mainheader">
	15	+$services.localization.render('forthcomingevents').toLowerCase()
	16	+</div>
	17	+<div>
	18	+ #foreach( $item in $itemFound )
	19	+ #if( !$foreach.first )
	20	+ <span class="menumainbody">&ensp;&bull;&ensp;</span>
	21	+ #end
	22	+ #eventlinked($item) <span class="textsecondary">(#eventyears($item))</span>
	23	+ #end
	24	+</div>
21	21	#end
22		-{{/velocity}}{{setMoreAdmin/}}{{noShortcuts/}}{{noTagFooter/}}{{yesObjectNew/}}
	26	+{{/html}}
	27	+{{/velocity}}{{pageDisplay sort="objectservice"/}}