Changes for page Users
From version 4.1
edited by Andrea Omicini
on 2026/08/29 00:47
on 2026/08/29 00:47
Change comment:
There is no comment for this version
To version 10.1
edited by Andrea Omicini
on 2026/08/29 17:36
on 2026/08/29 17:36
Change comment:
status recode: match the new lowercase values
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -5,7 +5,8 @@ 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. ... ... @@ -17,12 +17,17 @@ 17 17 #foreach( $s in $statusList ) 18 18 #set( $discard = $people.put($s, []) ) 19 19 #end 20 -#set( $rows = $services.query.xwql("from doc.object(XWiki.XWikiUsers) as u where u.status <> ''").execute() ) 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() ) 23 +#set( $seen = [] ) 21 21 #foreach( $ref in $rows ) 22 22 #set( $uDoc = $xwiki.getDocument($ref) ) 23 23 #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) ) 31 + #set( $discard = $seen.add($ref) ) 26 26 ## sort key: surname, then given name, then the reference 27 27 #set( $last = "$!uObj.getValue('last_name')" ) 28 28 #set( $first = "$!uObj.getValue('first_name')" ) ... ... @@ -30,14 +30,10 @@ 30 30 #end 31 31 #end 32 32 ## 33 -## one person: given name + bold surname, linked to the personalspacewhen there is one39 +## one person: given name + bold surname, linked to their XWiki user page 34 34 #macro( apicePerson $entry ) 35 35 #set( $bits = $entry.split('\|') ) 36 - #set( $pDoc = $xwiki.getDocument($bits[2]) ) 37 - #set( $pObj = $pDoc.getObject('XWiki.XWikiUsers') ) 38 - #set( $space = "$!pObj.getValue('personalWiki')" ) 39 - #if( $space != '' && $xwiki.exists("${space}.WebHome") )#set( $target = "${space}.WebHome" )#else#set( $target = $bits[2] )#end 40 -[[${bits[1]} **${bits[0]}**>>${target}]]## 42 +[[${bits[1]} **${bits[0]}**>>${bits[2]}]]## 41 41 #end 42 42 ## 43 43 ## a section, printed only when somebody is in it ... ... @@ -46,7 +46,7 @@ 46 46 #if( $group && !$group.isEmpty() ) 47 47 #set( $group = $collectiontool.sort($group) ) 48 48 49 ->$services.localization.render("XWiki.XWikiUsers_status_${status}") (%%)//($group.size())//51 +>$services.localization.render("XWiki.XWikiUsers_status_${status}") 50 50 51 51 #foreach( $entry in $group )#if( !$foreach.first ) • #end#apicePerson($entry)#end 52 52 ... ... @@ -55,16 +55,13 @@ 55 55 ## 56 56 #### CURRENT PEOPLE — every status except students and past members 57 57 #foreach( $s in $statusList ) 58 - #if( $s != ' Student' && $s != 'Gone' )60 + #if( $s != 'student' && $s != 'gone' ) 59 59 #apiceGroup($s) 60 60 #end 61 61 #end 62 62 ## 63 -#### STUDENTS 64 -#apiceGroup('Student') 65 -## 66 66 #### PAST MEMBERS 67 -#apiceGroup(' Gone')66 +#apiceGroup('gone') 68 68 ## 69 69 #### anyone whose status is not among those declared by the class — should be empty 70 70 #set( $strays = [] ) ... ... @@ -81,3 +81,4 @@ 81 81 82 82 #end 83 83 {{/velocity}} 83 +