Changes for page Per Year

From version 110.1
edited by Andrea Omicini
on 30/10/2021 17:31
Change comment: There is no comment for this version
To version 107.1
edited by Andrea Omicini
on 30/10/2021 17:24
Change comment: There is no comment for this version

Summary

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,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 -## try to specify a user
58 +#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,38 +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 -## $selectedCycle and $oneCycle set properly
92 -### END CYCLE
83 +## $oneUser and $oneCycle set properly
93 93  $yearList
94 94  #if( $oneYear )
95 95   $selectedYear
96 -#else
97 - ALL YEARS
98 98  #end
99 99  #if( $oneUser )
100 100   $selectedUser
101 -#else
102 - ALL USERS
103 103  #end
104 104  #if( $oneCycle )
105 105   $selectedCycle
106 -#else
107 - ALL USERS
93 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
108 108  #end
109 109  ### END USER & CYCLE
110 110  ##