Changes for page Per Year
From version 107.1
edited by Andrea Omicini
on 30/10/2021 17:24
on 30/10/2021 17:24
Change comment:
There is no comment for this version
To version 112.1
edited by Andrea Omicini
on 30/10/2021 17:32
on 30/10/2021 17:32
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -18,7 +18,7 @@ 18 18 #if( $request.to ) 19 19 #set( $toPar = $mathtool.toInteger($request.to) ) 20 20 #end 21 -#set years 21 +##set years 22 22 #if( $yearPar > 0 ) 23 23 #set( $oneYear = true ) 24 24 #set( $firstYear = $yearPar ) ... ... @@ -43,9 +43,10 @@ 43 43 #set( $yearList = [$lastYear..$firstYear] ) 44 44 #end 45 45 #end 46 +## $selectedYear, $yearList and $oneYear set properly 46 46 ### END YEAR 47 47 ## 48 -### START USER & CYCLE49 +### START USER 49 49 ## default values 50 50 #set( $oneUser = false ) 51 51 #set( $selectedUser = '' ) ... ... @@ -55,8 +55,8 @@ 55 55 #if( $request.user ) 56 56 #set( $userNamePar = $request.user.trim() ) 57 57 #end 58 -#if( $userName || $userNamePar || $userNamePar != '')59 -## a userisspecifiedforallroles59 +#if( $userName || $userNamePar ) 60 +## try to specify a user 60 60 #if( !$userName ) 61 61 #set( $selectedUser = "XWiki.$userNamePar" ) 62 62 #else ... ... @@ -72,25 +72,37 @@ 72 72 #stop 73 73 #end 74 74 #end 75 -##if user selected, existing user page 76 +## $selectedUser and $oneUser set properly 77 +### END USER 78 +## 79 +### START CYCLE 76 76 #set( $oneCycle = false ) 77 77 #set( $selectedCycle = '' ) 78 -#set( $cyclePar = $request.cycle.trim().toUpperCase() ) 82 +## cycle parameter 83 +#if( $request.cycle ) 84 + #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 85 +#end 86 +## set cycle 79 79 #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 80 80 #set( $oneCycle = true ) 81 81 #set( $selectedCycle = $cyclePar ) 82 82 #end 83 -## $ oneUserand $oneCycle set properly84 - $yearList91 +## $selectedCycle and $oneCycle set properly 92 +### END CYCLE 85 85 #if( $oneYear ) 86 86 $selectedYear 95 +#else 96 + $yearList 87 87 #end 88 88 #if( $oneUser ) 89 89 $selectedUser 100 +#else 101 + ALL USERS 90 90 #end 91 91 #if( $oneCycle ) 92 92 $selectedCycle 93 - {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}} 105 +#else 106 + ALL USERS 94 94 #end 95 95 ### END USER & CYCLE 96 96 ##