Changes for page Forthcoming

From version 61.1
edited by Andrea Omicini
on 16/06/2023 14:25
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,29 +1,20 @@
1 1  {{velocity}}
2 -{{html wiki="true" clean="false"}}
2 +{{html clean="false" wiki="true"}}
3 3  #template('apice_events.vm')
4 -#template('apice_macros.vm')
5 -#isuserspace()
6 -##
7 -#if( $isUserSpace )
8 - #userspace()
4 +#template('apice_user_param.vm')
9 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
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
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 " )
17 17  ## execute query
18 -#set( $eventsFound = $xwiki.searchDocuments($query) )
9 +#set( $itemFound = $xwiki.searchDocuments($query) )
19 19  ##
20 -#if( $eventsFound.size() > 0 )
11 +#if( $itemFound.size() > 0 )
21 21  <div class="mainheader">
22 22  $services.localization.render('forthcomingevents').toLowerCase()
23 23  </div>
24 24  #template('apice_event_macros.vm')
25 25  <div>
26 - #foreach($event in $eventsFound)
17 + #foreach( $event in $itemFound )
27 27   #if( !$foreach.first )
28 28   <span class="menumainbody">&ensp;&bull;&ensp;</span>
29 29   #end