Changes for page Deadlines

Summary

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

Details

Page properties

Content

...	...	@@ -1,26 +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')
5		-## user forthcoming events
	4	+#template('apice_macros.vm')
	5	+#isuserspace()
	6	+##
	7	+#if( $isUserSpace )
	8	+ #userspace()
	9	+ #set( $oneUser = true )
	10	+ #set( $userString = "%$userName%" )
	11	+#else
	12	+ #set( $oneUser = false )
	13	+#end
6	6	## incoming deadlines
7	7	#set( $query = ", BaseObject objEvent, DateProperty as propDate #if( $oneUser), BaseObject as objRole, LargeStringProperty as propWho #end
8	8	where doc.fullName = objEvent.name and objEvent.className = '${objectSpace}.${objectClass}' and objEvent.name <> '${objectPool}.${objectTemplate}' and propDate.id.id = objEvent.id and propDate.name = 'paper_submission' and date(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 '$userString' #end order by date(propDate.value) asc ")
9	9	## execute query
10		-#set( $itemFound = $xwiki.searchDocuments($query) )
	18	+#set( $eventsFound = $xwiki.searchDocuments($query) )
11	11	##
12		-#if( $itemFound.size() > 0 )
13		-<div class="mainheader">
14		-$services.localization.render('incomingdeadlines').toLowerCase()
15		-</div>
	20	+#if( $eventsFound.size() > 0 )
	21	+>$services.localization.render('incomingdeadlines').toLowerCase()
	22	+
16	16	#template('apice_event_macros.vm')
17	17	<div>
18		- #foreach( $item in $itemFound )
19		- #set( $itemDoc = $xwiki.getDocument($item) )
	25	+ #foreach( $event in $eventsFound )
	26	+ #set( $eventDoc = $xwiki.getDocument($event) )
20	20	#if( !$foreach.first )
21	21	<span class="textsecondary">&ensp;&bull;&ensp;</span>
22	22	#end
23		- #eventlinked($item)<span class="textprimary">#if( $itemDoc.display("paper_submission") != "" )<span class="textsecondary"> &mdash; </span>#if( $itemDoc.display("abstract_submission") != "" )$itemDoc.display("abstract_submission") <em>(abstract)</em><span class="textsecondary"> / </span>#end$itemDoc.display("paper_submission") <em>(submission)</em>#end</span>
	30	+ #eventlinked($event)<span class="textprimary">#if( $eventDoc.display("paper_submission") != "" )<span class="textsecondary"> &mdash; </span>#if( $eventDoc.display("abstract_submission") != "" )$eventDoc.display("abstract_submission") <em>(abstract)</em><span class="textsecondary"> / </span>#end$eventDoc.display("paper_submission") <em>(submission)</em>#end</span>
24	24	#end
25	25	</div>
26	26	#end