Changes for page Forthcoming

From version 58.1
edited by Andrea Omicini
on 16/06/2023 13:09
Change comment: There is no comment for this version
To version 62.1
edited by Andrea Omicini
on 25/06/2023 10:44
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,24 +1,20 @@
1 1  {{velocity}}
2 -{{html wiki="true" clean="false"}}
2 +{{html clean="false" wiki="true"}}
3 3  #template('apice_events.vm')
4 -##
5 -#if( !$userName || $userName == "" || !$userSpace || $userSpace == "" || !$userFullname || $userFullname == "" )
6 -## overall forthcoming events
7 - #set( $query = ", BaseObject objEvent, DateProperty as propDate
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 = 'start_date' and propDate.value > current_date() order by propDate.value asc " )
9 -#else
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 -#end
4 +#template('apice_user_param.vm')
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 " )
13 13  ## execute query
14 -#set( $eventsFound = $xwiki.searchDocuments($query) )
9 +#set( $itemFound = $xwiki.searchDocuments($query) )
15 15  ##
16 -#if( $eventsFound.size() > 0 )
17 ->$services.localization.render('forthcomingevents').toLowerCase()
18 -
11 +#if( $itemFound.size() > 0 )
12 +<div class="mainheader">
13 +$services.localization.render('forthcomingevents').toLowerCase()
14 +</div>
19 19  #template('apice_event_macros.vm')
20 20  <div>
21 - #foreach($event in $eventsFound)
17 + #foreach( $event in $itemFound )
22 22   #if( !$foreach.first )
23 23   <span class="menumainbody">&ensp;&bull;&ensp;</span>
24 24   #end