Changes for page Users

Summary

• Page properties (2 modified, 0 added, 0 removed)

Details

Page properties

Title

...	...	@@ -1,0 +1,1 @@
	1	+$services.localization.render('users')

Content

...	...	@@ -5,38 +5,28 @@
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. Disabled accounts (active = 0)
9		-## are left out.
	8	+## up here; change someone's status and they move.
10	10	##
11	11	## Headings use the translation keys XWiki.XWikiUsers_status_<value>, so the page
12	12	## is bilingual without a single string of its own.
13	13	################################################################################
14	14	##
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		-## an optional ?status=<value> filter. The value is validated against the list the
18		-## class itself declares, so no status value is written down here: change the class
19		-## and both the grouping and the filter follow.
20		-#set( $wanted = "$!request.getParameter('status')" )
21		-#set( $known = ( $wanted == '' || $statusList.contains($wanted) ) )
22		-#set( $people = {} )
23		-#foreach( $s in $statusList )
24		- #set( $discard = $people.put($s, []) )
25		-#end
26		-## distinct: a user page with a translation (XWiki.AntonioNatali.it) returns one row per locale
27		-#set( $rows = $services.query.xwql("select distinct doc.fullName from Document doc, doc.object(XWiki.XWikiUsers) as u where u.status <> ''").execute() )
	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() )
28	28	#set( $seen = [] )
29	29	#foreach( $ref in $rows )
30	30	#set( $uDoc = $xwiki.getDocument($ref) )
31		- #set( $uObj = $uDoc.getObject('XWiki.XWikiUsers') )
	23	+ #set( $uObj = $uDoc.getObjec
32	32	#set( $st = "$!uObj.getValue('status')" )
33		- ## `active` is unset on most user objects, so only an explicit 0 counts as disabled
34		- #set( $isActive = ("$!uObj.getValue('active')" != '0') )
35		- #if( $people.containsKey($st) && $isActive && !$seen.contains($ref) )
	25	+ #if( $people.containsKey($st )
36	36	#set( $discard = $seen.add($ref) )
37		- ## sort key: surname, then given name, then the reference
	27	+ ## sort key: surname, thenrence
38	38	#set( $last = "$!uObj.getValue('last_name')" )
39		- #set( $first = "$!uObj.getValue('first_name')" )
	29	+ #set( $first = "$!uObj.get
40	40	#set( $discard = $people.get($st).add("${last}|${first}|${ref}") )
41	41	#end
42	42	#end
...	...	@@ -44,57 +44,45 @@
44	44	## one person: given name + bold surname, linked to their XWiki user page
45	45	#macro( apicePerson $entry )
46	46	#set( $bits = $entry.split('\|') )
47		-[[${bits[1]} **${bits[0]}**>>${bits[2]}]]##
	37	+[[${bits[1]} **${bits[0]}**>>$
48	48	#end
49	49	##
50	50	## a section, printed only when somebody is in it
51	51	#macro( apiceGroup $status )
52	52	#set( $group = $people.get($status) )
53		- #if( $group && !$group.isEmpty() )
	43	+ #if( $group && !$group.isEmp
54	54	#set( $group = $collectiontool.sort($group) )
55	55
56	56	>$services.localization.render("XWiki.XWikiUsers_status_${status}")
	47	+(%%)//($group.size())//
57	57
58		- #foreach( $entry in $group )#if( !$foreach.first ) • #end#apicePerson($entry)#end
	49	+ #foreach( $entry in $group• #end#apicePerson($entry)#end
59	59
60	60	#end
61	61	#end
62	62	##
63		-#if( !$known )
64		-#### the class does not declare this value — say so, and show what it does declare
65		->{{stringEngIta eng="Unknown status" ita="Stato sconosciuto"/}}: **$escapetool.xml($wanted)**
66		-
67		- #foreach( $s in $statusList )[[$services.localization.render("XWiki.XWikiUsers_status_${s}")>>path:$doc.getURL('view', "status=${s}")]]#if( !$foreach.last ) • #end#end
68		-
69		-#elseif( $wanted != '' )
70		-#### ONE GROUP, ASKED FOR BY ?status= — students included, like any other value
71		- #if( $people.get($wanted).isEmpty() )
72		-
73		->{{stringEngIta eng="Nobody has this status" ita="Nessuno ha questo stato"/}}
74		-
75		- #else
76		- #apiceGroup($wanted)
77		- #end
78		-#else
79		-#### EVERY GROUP THE CLASS DECLARES, in the class's own order
	54	+#### CURRENT PEOPLE — every status except students and past members
80	80	#foreach( $s in $statusList )
81		- #apiceGroup($s)
	56	+ #if( $s != 'Student' && $s != 'Gone' )
	57	+ #apiceGroup($s)
	58	+ #end
82	82	#end
83	83	##
	61	+#### PAST MEMBERS
	62	+#apiceGroup('Gone')
	63	+##
84	84	#### anyone whose status is not among those declared by the class — should be empty
85	85	#set( $strays = [] )
86	86	#foreach( $ref in $rows )
87		- #set( $uObj = $xwiki.getDocument($ref).getObject('XWiki.XWikiUsers') )
	67	+ #set( $uObj = $xwiki.getDocui.XWikiUsers') )
88	88	#set( $st = "$!uObj.getValue('status')" )
89		- #if( !$people.containsKey($st) )#set( $discard = $strays.add("${ref} (${st})") )#end
	69	+ #if( !$people.containsKey($sys.add("${ref} (${st})") )#end
90	90	#end
91	91	#if( !$strays.isEmpty() )
92	92
93		->{{stringEngIta eng="Unrecognised status" ita="Stato non riconosciuto"/}}
	73	+>{{stringEngIta eng="Unrecogni riconosciuto"/}}
94	94
95		- #foreach( $stray in $strays )$stray#if( !$foreach.last ) • #end#end
	75	+ #foreach( $stray in $strays ) • #end#end
96	96
97	97	#end
98		-#end
99	99	{{/velocity}}
100		-