Changes for page Per Status

From version 90.1
edited by Andrea Omicini
on 22/06/2023 13:01
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
... ... @@ -31,7 +31,6 @@
31 31  ## HANDLE INLINE / END
32 32  ##
33 33  ## HANDLE STATUS / START
34 -#template('apice_publications.vm')
35 35  ## $oneStatus false gets a list of statuses, true just one
36 36  #set( $oneStatus = false )
37 37  #set( $showRejected = false )
... ... @@ -106,7 +106,7 @@
106 106  ## map & counter initialisation
107 107  #set( $itemMap = {} )
108 108  #set( $itemNo = 0 )
109 -## cycle over statuses
108 +## cycle over sorts
110 110  #foreach( $status in $statusList )
111 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 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" )
... ... @@ -118,7 +118,6 @@
118 118   #set( $itemNo = $itemNo + $itemStatusNo )
119 119   #end
120 120  #end
121 -$itemStatusNo
122 122  ##
123 123  ## output results
124 124  ## page subtitle
... ... @@ -145,8 +145,8 @@
145 145   <div style="flex-grow: 1">
146 146   </div>
147 147   <div">
148 - <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>
149 - <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>
150 150   </div>
151 151  </div>
152 152  ## stop if no pubs are found
... ... @@ -157,7 +157,7 @@
157 157  ## some pubs found
158 158  ## page index
159 159  #if( $itemMap.keySet().size() > 1 )
160 -## found more than one status
158 +## found more than one sort
161 161  <div class="mainselectbar" id="index">
162 162   #foreach( $status in $itemMap.keySet() )
163 163   #if( !$foreach.first )
... ... @@ -170,7 +170,7 @@
170 170  ##
171 171  #template('apice_publication_macros.vm')
172 172  ##
173 -#foreach( $status in $itemMap.keySet() )
171 +#foreach( $sort in $itemMap.keySet() )
174 174  ## status top / start
175 175  <div class="mainselectseparator">
176 176   <a class="mainselectseparatorlink" id="$status" href=$xwiki.getURL($doc,"view","status=$status#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")>
... ... @@ -183,7 +183,7 @@
183 183  <div>
184 184   #if( $showInline && !$showBibtex )
185 185   <ul>
186 - #foreach( $item in $itemMap[$status] )
184 + #foreach( $item in $itemMap[$sort] )
187 187   <li>#publinked($item)</li>
188 188  ## <li>#pubperstatus($item)</li>
189 189   #end