Changes for page Per Year
From version 20.3
edited by Andrea Omicini
on 25/10/2021 17:04
on 25/10/2021 17:04
Change comment:
There is no comment for this version
To version 17.5
edited by Andrea Omicini
on 25/10/2021 16:48
on 25/10/2021 16:48
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -9,7 +9,6 @@ 9 9 #else 10 10 #set( $selectedStatus = 'all' ) 11 11 #end 12 -$selectedStatus 13 13 ##check velocity variable, takes precedence 14 14 #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 15 15 #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) ... ... @@ -93,16 +93,6 @@ 93 93 #set( $contactFirstName = $contactdoc.display("first_name") ) 94 94 #set( $contactLastName = $contactdoc.display("last_name") ) 95 95 #end 96 -$selectedStatus 97 -$userSelected 98 -$roleSelected 99 -$supervisor 100 -$cosupervisor 101 -$contact 102 -$userFirstName $userLastName 103 -$supervisorFirstName $supervisorLastName 104 -$cosupervisorFirstName $cosupervisorLastName 105 -$contactFirstName $contactLastName 106 106 ## 107 107 ## $userSelected true and $roleSelected false means one user for all roles 108 108 ## $userSelected true and $roleSelected true for one user with one specific role ... ... @@ -157,12 +157,11 @@ 157 157 ## no user selected, some role selected 158 158 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 159 159 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 prop0.name = 'status' and prop1.name = '$orderingDateFieldName' and prop0.value = '$thesisStatus' order by prop1.value desc" ) 160 - #end 161 161 #end 162 -#set( 150 +#set($thesisFound = $xwiki.searchDocuments($sql)) 163 163 ## 164 164 #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 165 - ##* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName") != "" && $thesisDoc.getValue("studentLastName") != "" ) ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end166 - * $thesis153 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName") != "" && $thesisDoc.getValue("studentLastName") != "" ) ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end 154 + 167 167 #end 168 168 {{/velocity}}