Modifiche per il documento Per stato

Dalla versione 93.1
modificato da Andrea Omicini
il 22/06/2023 13:33
Cambia il commento: Nessun commento per questa versione
Alla versione 90.1
modificato da Andrea Omicini
il 22/06/2023 13:01
Cambia il commento: Nessun commento per questa versione

Summary

Details

Page properties
Content
... ... @@ -35,7 +35,6 @@
35 35  ## $oneStatus false gets a list of statuses, true just one
36 36  #set( $oneStatus = false )
37 37  #set( $showRejected = false )
38 -#set( $showPublished = false )
39 39  ## $statusList gets the list of statuses to be shown
40 40  #set( $statusList = $publicationStatuses )
41 41  ##
... ... @@ -43,18 +43,12 @@
43 43  #if( $statusPar.toLowerCase() == "all" )
44 44  ## 'all' value gets all unpublished papers including "Rejected" ones
45 45   #set( $showRejected = true )
46 -#elseif( $statusPar.toLowerCase() == "published" )
47 - #set( $oneStatus = true )
48 - #set( $statusList = ["published"] )
49 - #set( $showPublished = true )
50 -#elseif( $statusPar.toLowerCase() == "rejected" )
51 - #set( $oneStatus = true )
52 - #set( $statusList = ["rejected"] )
53 - #set( $showRejected = true )
54 -#elseif( $publicationStatuses.contains($statusPar) )
55 -## 'status' parameter is an admissible publication status value
56 - #set( $oneStatus = true )
57 - #set( $statusList = [$statusPar] )
45 +#else
46 + #if( $publicationStatuses.contains($statusPar) )
47 + ## 'status' parameter is an admissible publication status value
48 + #set( $oneStatus = true )
49 + #set( $statusList = [$statusPar] )
50 + #end
58 58  #end
59 59  ##
60 60  ## HANDLE STATUS / END
... ... @@ -115,18 +115,17 @@
115 115  #set( $itemNo = 0 )
116 116  ## cycle over statuses
117 117  #foreach( $status in $statusList )
118 - #if( $status != "published" && $status != "rejected" || $status == "published" && $showPublished || $status == "rejected" && $showRejected )
119 - #set( $query = ", BaseObject as obj, #if( $oneUser ) LargeStringProperty as propAuthor, LargeStringProperty as propEditor, #end StringProperty as propStatus #if( !$hasEdit ), StringProperty as propAccess #end
120 - where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectPool}.${objectTemplate}' #if( $oneUser ) and propAuthor.id.id = obj.id and propEditor.id.id = obj.id and propAuthor.name = 'author' and propEditor.name = 'editor' and ( propAuthor.value like '$userString' or ( propAuthor.value = '' and propEditor.value like '$userString' ) ) #end and propStatus.id.id = obj.id and propStatus.name = 'status' and propStatus.value = '$status' #if( !$hasEdit ) and propAccess.id.id = obj.id and propAccess.name = 'access' and propAccess.value <> 'hidden' #end" )
121 - #set( $itemFound = $xwiki.searchDocuments($query) )
111 + #set( $query = ", BaseObject as obj, #if( $oneUser ) LargeStringProperty as propAuthor, LargeStringProperty as propEditor, #end StringProperty as propStatus #if( !$hasEdit ), StringProperty as propAccess #end
112 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectPool}.${objectTemplate}' #if( $oneUser ) and propAuthor.id.id = obj.id and propEditor.id.id = obj.id and propAuthor.name = 'author' and propEditor.name = 'editor' and ( propAuthor.value like '$userString' or ( propAuthor.value = '' and propEditor.value like '$userString' ) ) #end and propStatus.id.id = obj.id and propStatus.name = 'status' and propStatus.value = '$status' #if( !$hasEdit ) and propAccess.id.id = obj.id and propAccess.name = 'access' and propAccess.value <> 'hidden' #end" )
113 + #set( $itemFound = $xwiki.searchDocuments($query) )
122 122  ## set counters
123 - #set( $itemStatusNo = $itemFound.size() )
124 - #if( $itemStatusNo > 0 )
125 - #set( $itemMap[$status] = $itemFound )
126 - #set( $itemNo = $itemNo + $itemStatusNo )
127 - #end
115 + #set( $itemStatusNo = $itemFound.size() )
116 + #if( $itemStatusNo > 0 )
117 + #set( $itemMap[$status] = $itemFound )
118 + #set( $itemNo = $itemNo + $itemStatusNo )
128 128   #end
129 129  #end
121 +$itemStatusNo
130 130  ##
131 131  ## output results
132 132  ## page subtitle
... ... @@ -135,26 +135,14 @@
135 135  $itemNo
136 136  #if( $oneStatus )
137 137   #if( $itemNo == 1 )
138 - $services.localization.render('work').toLowerCase()
139 - <span class="textsecondary">&ensp;/&ensp;</span>
140 140   $services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}").toLowerCase()
141 141   #else
142 - $services.localization.render('works').toLowerCase()
143 - <span class="textsecondary">&ensp;/&ensp;</span>
144 - $services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}_plural").toLowerCase() #end
132 +$services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}_plural").toLowerCase() #end
145 145  #else
146 146   #if( $itemNo == 1 )
147 - #if( $showPublished )
148 - $services.localization.render('work').toLowerCase()
149 - #else
150 - $services.localization.render('yetunpublished_singular').toLowerCase()
151 - #end
135 + $services.localization.render('yetunpublished_singular').toLowerCase()
152 152   #else
153 - #if( $showPublished )
154 - $services.localization.render('works').toLowerCase()
155 - #else
156 - $services.localization.render('yetunpublished').toLowerCase()
157 - #end
137 + $services.localization.render('yetunpublished').toLowerCase()
158 158   #end
159 159  #end
160 160  #if( $oneUser )