Changes for page Per Year

From version 34.1
edited by Andrea Omicini
on 25/10/2021 19:46
Change comment: There is no comment for this version
To version 32.1
edited by Andrea Omicini
on 25/10/2021 19:32
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -28,6 +28,7 @@
28 28  ##
29 29  ### START USER & ROLE
30 30  #set( $userNamePar = $request.user.trim() )
31 +#set( $rolePar = $request.role.trim().toLowerCase() )
31 31  ## default values
32 32  #set( $userSelected = false )
33 33  #set( $userFirstName = "" )
... ... @@ -49,7 +49,6 @@
49 49   #stop
50 50   #end
51 51  ##user selected and existing user page
52 - #set( $rolePar = $request.role.trim().toLowerCase() )
53 53   #set( $roleSelected = false )
54 54   #set( $selectedRole = '' )
55 55   #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
... ... @@ -79,14 +79,15 @@
79 79   #else
80 80   #set( $roleSelectedFieldName = "supervisor" )
81 81   #end
82 + #end
82 82  ## some selected role or all roles / now $role
83 83  === $role ===
84 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
85 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
85 85   where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'status' and prop1.name = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
86 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
87 - #foreach( $thesis in $thesisFound )
87 + #end
88 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
89 + #foreach( $thesis in $thesisFound )
88 88  * $thesis
89 - #end
90 90   #end
91 91   #end
92 92  ## no user selected, no role selected