Changes for page Per Year

From version 106.1
edited by Andrea Omicini
on 30/10/2021 17:19
Change comment: There is no comment for this version
To version 103.4
edited by Andrea Omicini
on 30/10/2021 17:10
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -40,10 +40,10 @@
40 40  #set( $userNamePar = $request.user.trim() )
41 41  ## default values
42 42  #set( $oneUser = false )
43 -#set( $selectedUser = '' )
43 +#set( $oneCycle = false )
44 44  #set( $userFirstName = "" )
45 45  #set( $userLastName = "" )
46 -#if( $userName || $userNamePar || $userNamePar != '' )
46 +#if( $userName || $userNamePar )
47 47  ## a user is specified for all roles
48 48   #if( !$userName )
49 49   #set( $selectedUser = "XWiki.$userNamePar" )
... ... @@ -59,15 +59,14 @@
59 59  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
60 60   #stop
61 61   #end
62 +##user selected and existing user page
63 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
64 + #set( $selectedCycle = '' )
65 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
66 + #set( $oneCycle = true )
67 + #set( $selectedCycle = $cyclePar )
68 + #end
62 62  #end
63 -##if user selected, existing user page
64 -#set( $oneCycle = false )
65 -#set( $selectedCycle = '' )
66 -#set( $cyclePar = $request.cycle.trim().toUpperCase() )
67 -#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
68 - #set( $oneCycle = true )
69 - #set( $selectedCycle = $cyclePar )
70 -#end
71 71  ## $oneUser and $oneCycle set properly
72 72  $yearList
73 73  #if( $oneYear )
... ... @@ -78,7 +78,6 @@
78 78  #end
79 79  #if( $oneCycle )
80 80   $selectedCycle
81 - {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
82 82  #end
83 83  ### END USER & CYCLE
84 84  ##