Changes for page Forthcoming
From version 59.2
edited by Andrea Omicini
on 16/06/2023 13:31
on 16/06/2023 13:31
Change comment:
There is no comment for this version
To version 56.1
edited by Andrea Omicini
on 10/06/2023 10:05
on 10/06/2023 10:05
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,18 +1,13 @@ 1 1 {{velocity}} 2 -{{html wiki="true" clean="false"}} 3 3 #template('apice_events.vm') 4 -#template('apice_macros.vm') 5 -#isuserspace() 6 6 ## 7 -#if( $isUserSpace ) 8 - #userspace() 9 -## user forthcoming events 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 4 +#if( !$userName || $userName == "" || !$userSpace || $userSpace == "" || !$userFullname || $userFullname == "" ) 13 13 ## overall forthcoming events 14 14 #set( $query = ", BaseObject objEvent, DateProperty as propDate 15 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 " ) 8 +#else 9 + #set( $query = ", BaseObject as objEvent, BaseObject as objRole, LargeStringProperty as propWho, DateProperty as propDate 10 + 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 " ) 16 16 #end 17 17 ## execute query 18 18 #set( $eventsFound = $xwiki.searchDocuments($query) ) ... ... @@ -20,15 +20,9 @@ 20 20 #if( $eventsFound.size() > 0 ) 21 21 >$services.localization.render('forthcomingevents').toLowerCase() 22 22 23 -#template('apice_event_macros.vm') 24 -<div> 25 25 #foreach($event in $eventsFound) 26 - #if( !$foreach.first ) 27 - <span class="menumainbody"> • </span> 28 - #end 29 - #eventlinked($event) <span class="textsecondary">(#eventyears($event))</span> 30 - #end 31 -</div> 19 + #set( $eventDoc = $xwiki.getDocument($event) ) 20 +#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 21 +(%%) 32 32 #end 33 -{{/html}} 34 34 {{/velocity}}{{pageDisplay sort="objectservice"/}}