Changes for page Users
From version 5.1
edited by Andrea Omicini
on 2026/08/29 00:50
on 2026/08/29 00:50
Change comment:
There is no comment for this version
To version 9.1
edited by Andrea Omicini
on 2026/08/29 01:11
on 2026/08/29 01:11
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -5,28 +5,33 @@ 5 5 ## Nothing is hand-maintained here: the groups are the values declared by 6 6 ## XWiki.XWikiUsers.status, in the class's own order, and every user carrying a 7 7 ## status appears in exactly one of them. Add a status to the class and it shows 8 -## up here; change someone's status and they move. 8 +## up here; change someone's status and they move. Disabled accounts (active = 0) 9 +## are left out. 9 9 ## 10 10 ## Headings use the translation keys XWiki.XWikiUsers_status_<value>, so the page 11 11 ## is bilingual without a single string of its own. 12 12 ################################################################################ 13 13 ## 14 -## the groups, in class order,users themselves 15 -#set( $statusList = $xwiki.getDocument('XWiki.XWiket('status').getListValues() ) 16 -#set( $people = {} ) #foreach( $s in $statusList ) 17 - #set( $discard = $people.put($s, []) ) #end 18 -## distinct: a user page with a translation (XWiki.AntonioNatali.it) returns one rowlocale 19 -#set( $rows = $services.query.xwql("select distinct doc.fullName from Document doc, doc.object(XWiki.XWikiUsers) a.execute() ) 15 +## the groups, in class order, and the people, from the users themselves 16 +#set( $statusList = $xwiki.getDocument('XWiki.XWikiUsers').getxWikiClass().get('status').getListValues() ) 17 +#set( $people = {} ) 18 +#foreach( $s in $statusList ) 19 + #set( $discard = $people.put($s, []) ) 20 +#end 21 +## distinct: a user page with a translation (XWiki.AntonioNatali.it) returns one row per locale 22 +#set( $rows = $services.query.xwql("select distinct doc.fullName from Document doc, doc.object(XWiki.XWikiUsers) as u where u.status <> ''").execute() ) 20 20 #set( $seen = [] ) 21 21 #foreach( $ref in $rows ) 22 22 #set( $uDoc = $xwiki.getDocument($ref) ) 23 - #set( $uObj = $uDoc.getObjec 26 + #set( $uObj = $uDoc.getObject('XWiki.XWikiUsers') ) 24 24 #set( $st = "$!uObj.getValue('status')" ) 25 - #if( $people.containsKey($st ) 28 + ## `active` is unset on most user objects, so only an explicit 0 counts as disabled 29 + #set( $isActive = ("$!uObj.getValue('active')" != '0') ) 30 + #if( $people.containsKey($st) && $isActive && !$seen.contains($ref) ) 26 26 #set( $discard = $seen.add($ref) ) 27 - ## sort key: surname, thenrence 32 + ## sort key: surname, then given name, then the reference 28 28 #set( $last = "$!uObj.getValue('last_name')" ) 29 - #set( $first = "$!uObj.get 34 + #set( $first = "$!uObj.getValue('first_name')" ) 30 30 #set( $discard = $people.get($st).add("${last}|${first}|${ref}") ) 31 31 #end 32 32 #end ... ... @@ -34,19 +34,18 @@ 34 34 ## one person: given name + bold surname, linked to their XWiki user page 35 35 #macro( apicePerson $entry ) 36 36 #set( $bits = $entry.split('\|') ) 37 -[[${bits[1]} **${bits[0]}**>>$ 42 +[[${bits[1]} **${bits[0]}**>>${bits[2]}]]## 38 38 #end 39 39 ## 40 40 ## a section, printed only when somebody is in it 41 41 #macro( apiceGroup $status ) 42 42 #set( $group = $people.get($status) ) 43 - #if( $group && !$group.isEmp 48 + #if( $group && !$group.isEmpty() ) 44 44 #set( $group = $collectiontool.sort($group) ) 45 45 46 46 >$services.localization.render("XWiki.XWikiUsers_status_${status}") 47 -(%%)//($group.size())// 48 48 49 - #foreach( $entry in $group• #end#apicePerson($entry)#end 53 + #foreach( $entry in $group )#if( !$foreach.first ) • #end#apicePerson($entry)#end 50 50 51 51 #end 52 52 #end ... ... @@ -64,15 +64,16 @@ 64 64 #### anyone whose status is not among those declared by the class — should be empty 65 65 #set( $strays = [] ) 66 66 #foreach( $ref in $rows ) 67 - #set( $uObj = $xwiki.getDocui.XWikiUsers') ) 71 + #set( $uObj = $xwiki.getDocument($ref).getObject('XWiki.XWikiUsers') ) 68 68 #set( $st = "$!uObj.getValue('status')" ) 69 - #if( !$people.containsKey($sys.add("${ref} (${st})") )#end 73 + #if( !$people.containsKey($st) )#set( $discard = $strays.add("${ref} (${st})") )#end 70 70 #end 71 71 #if( !$strays.isEmpty() ) 72 72 73 ->{{stringEngIta eng="Unrecogni riconosciuto"/}} 77 +>{{stringEngIta eng="Unrecognised status" ita="Stato non riconosciuto"/}} 74 74 75 - #foreach( $stray in $strays ) • #end#end 79 + #foreach( $stray in $strays )$stray#if( !$foreach.last ) • #end#end 76 76 77 77 #end 78 78 {{/velocity}} 83 +