Changes for page Per Status

From version 89.1
edited by Andrea Omicini
on 22/06/2023 13:00
Change comment: There is no comment for this version
To version 87.1
edited by Andrea Omicini
on 22/06/2023 12:58
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -105,7 +105,7 @@
105 105  ## map & counter initialisation
106 106  #set( $itemMap = {} )
107 107  #set( $itemNo = 0 )
108 -## cycle over statuses
108 +## cycle over sorts
109 109  #foreach( $status in $statusList )
110 110   #set( $query = ", BaseObject as obj, #if( $oneUser ) LargeStringProperty as propAuthor, LargeStringProperty as propEditor, #end StringProperty as propStatus #if( !$hasEdit ), StringProperty as propAccess #end
111 111   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" )
... ... @@ -117,7 +117,6 @@
117 117   #set( $itemNo = $itemNo + $itemStatusNo )
118 118   #end
119 119  #end
120 -$itemStatusNo
121 121  ##
122 122  ## output results
123 123  ## page subtitle
... ... @@ -144,8 +144,8 @@
144 144   <div style="flex-grow: 1">
145 145   </div>
146 146   <div">
147 - <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","bibtex=$showBibtex&inline=#if( $showInline )false#{else}true#end#if( $oneStatus )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )#if( $showInline )formatted#{else}plain#end#else#if( $showInline )long#{else}short#end#end</a>
148 - <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","inline=$showInline&bibtex=#if( $showBibtex )false#{else}true#end#if( $oneStatus )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )text#{else}bib#end</a>
146 + <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","bibtex=$showBibtex&inline=#if( $showInline )false#{else}true#end#if( $oneSort )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )#if( $showInline )formatted#{else}plain#end#else#if( $showInline )long#{else}short#end#end</a>
147 + <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","inline=$showInline&bibtex=#if( $showBibtex )false#{else}true#end#if( $oneSort )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )text#{else}bib#end</a>
149 149   </div>
150 150  </div>
151 151  ## stop if no pubs are found
... ... @@ -156,7 +156,7 @@
156 156  ## some pubs found
157 157  ## page index
158 158  #if( $itemMap.keySet().size() > 1 )
159 -## found more than one status
158 +## found more than one sort
160 160  <div class="mainselectbar" id="index">
161 161   #foreach( $status in $itemMap.keySet() )
162 162   #if( !$foreach.first )
... ... @@ -169,7 +169,7 @@
169 169  ##
170 170  #template('apice_publication_macros.vm')
171 171  ##
172 -#foreach( $status in $itemMap.keySet() )
171 +#foreach( $sort in $itemMap.keySet() )
173 173  ## status top / start
174 174  <div class="mainselectseparator">
175 175   <a class="mainselectseparatorlink" id="$status" href=$xwiki.getURL($doc,"view","status=$status#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")>
... ... @@ -182,7 +182,7 @@
182 182  <div>
183 183   #if( $showInline && !$showBibtex )
184 184   <ul>
185 - #foreach( $item in $itemMap[$status] )
184 + #foreach( $item in $itemMap[$sort] )
186 186   <li>#publinked($item)</li>
187 187  ## <li>#pubperstatus($item)</li>
188 188   #end