Changes for page Per Year
From 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
To 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
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 years21 +#set years 22 22 #if( $yearPar > 0 ) 23 23 #set( $oneYear = true ) 24 24 #set( $firstYear = $yearPar ) ... ... @@ -43,10 +43,9 @@ 43 43 #set( $yearList = [$lastYear..$firstYear] ) 44 44 #end 45 45 #end 46 -## $selectedYear, $yearList and $oneYear set properly 47 47 ### END YEAR 48 48 ## 49 -### START USER 48 +### START USER & CYCLE 50 50 ## default values 51 51 #set( $oneUser = false ) 52 52 #set( $selectedUser = '' ) ... ... @@ -56,8 +56,8 @@ 56 56 #if( $request.user ) 57 57 #set( $userNamePar = $request.user.trim() ) 58 58 #end 59 -#if( $userName || $userNamePar ) 60 -## trytospecifyauser58 +#if( $userName || $userNamePar || $userNamePar != '' ) 59 +## a user is specified for all roles 61 61 #if( !$userName ) 62 62 #set( $selectedUser = "XWiki.$userNamePar" ) 63 63 #else ... ... @@ -73,37 +73,25 @@ 73 73 #stop 74 74 #end 75 75 #end 76 -## $selectedUser and $oneUser set properly 77 -### END USER 78 -## 79 -### START CYCLE 75 +##if user selected, existing user page 80 80 #set( $oneCycle = false ) 81 81 #set( $selectedCycle = '' ) 82 -## cycle parameter 83 -#if( $request.cycle ) 84 - #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 85 -#end 86 -## set cycle 78 +#set( $cyclePar = $request.cycle.trim().toUpperCase() ) 87 87 #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 88 88 #set( $oneCycle = true ) 89 89 #set( $selectedCycle = $cyclePar ) 90 90 #end 91 -## $se lectedCycleand $oneCycle set properly92 - ### END CYCLE83 +## $oneUser and $oneCycle set properly 84 +$yearList 93 93 #if( $oneYear ) 94 94 $selectedYear 95 -#else 96 - $yearList 97 97 #end 98 98 #if( $oneUser ) 99 99 $selectedUser 100 -#else 101 - ALL USERS 102 102 #end 103 103 #if( $oneCycle ) 104 104 $selectedCycle 105 -#else 106 - ALL USERS 93 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}} 107 107 #end 108 108 ### END USER & CYCLE 109 109 ##