Changes for page Forthcoming

Summary

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

Details

Page properties

Content

...	...	@@ -1,24 +1,33 @@
1	1	{{velocity}}
2		-{{html clean="false" wiki="true"}}
	2	+{{html wiki="true" clean="false"}}
3	3	#template('apice_events.vm')
4		-#template('apice_user_param.vm')
	4	+#template('apice_macros.vm')
	5	+#isuserspace()
	6	+##
	7	+#if( $isUserSpace )
	8	+ #userspace()
5	5	## user forthcoming events
6		-#set( $query = ", BaseObject as objEvent #if( $oneUser ), BaseObject as objRole, LargeStringProperty as propWho #end, DateProperty as propDate
7		- 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() #if( $oneUser ) 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%' #end order by propDate.value asc " )
	10	+ #set( $query = ", BaseObject as objEvent, BaseObject as objRole, LargeStringProperty as propWho, DateProperty as propDate
	11	+ 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 " )
	12	+#else
	13	+## overall forthcoming events
	14	+ #set( $query = ", BaseObject objEvent, DateProperty as propDate
	15	+ 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 " )
	16	+#end
8	8	## execute query
9		-#set( $itemFound = $xwiki.searchDocuments($query) )
	18	+#set( $eventsFound = $xwiki.searchDocuments($query) )
10	10	##
11		-#if( $itemFound.size() > 0 )
	20	+#if( $eventsFound.size() > 0 )
12	12	<div class="mainheader">
13	13	$services.localization.render('forthcomingevents').toLowerCase()
14	14	</div>
15	15	#template('apice_event_macros.vm')
16	16	<div>
17		- #foreach( $item in $itemFound )
	26	+ #foreach($event in $eventsFound)
18	18	#if( !$foreach.first )
19	19	<span class="menumainbody">&ensp;&bull;&ensp;</span>
20	20	#end
21		- #eventlinked($item) <span class="textsecondary">(#eventyears($item))</span>
	30	+ #eventlinked($event) <span class="textsecondary">(#eventyears($event))</span>
22	22	#end
23	23	</div>
24	24	#end