Änderungen von Dokument Team

Zusammenfassung

• Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)
• Objekte (1 geändert, 1 hinzugefügt, 0 gelöscht)
  • XWiki.WikiMacroClass[0]
  • XWiki.WikiMacroParameterClass[10]

Details

Seiteneigenschaften

Inhalt

...	...	@@ -4,6 +4,7 @@
4	4
5	5	|= Parameter |= Name |= Description |= Default
6	6	| tag | {{translation key='rendering.macro.team.parameter.tag.name'/}} | {{translation key='rendering.macro.team.parameter.tag.description'/}} |
	7	+| users | {{translation key='rendering.macro.team.parameter.users.name'/}} | {{translation key='rendering.macro.team.parameter.users.description'/}} |
7	7	| size | {{translation key='rendering.macro.team.parameter.size.name'/}} | {{translation key='rendering.macro.team.parameter.size.description'/}} | 60
8	8	| showUsernames | {{translation key='rendering.macro.team.parameter.showUsernames.name'/}} | {{translation key='rendering.macro.team.parameter.showUsernames.description'/}} | false
9	9	| letterAvatarBgColor | {{translation key='rendering.macro.team.parameter.letterAvatarBgColor.name'/}} | {{translation key='rendering.macro.team.parameter.letterAvatarBgColor.description'/}} | #0A6

XWiki.WikiMacroClass[0]

Makro-Code

...	...	@@ -9,7 +9,7 @@
9	9	>
10	10	<span class="xwikiteam-avatar-initials-inner">
11	11	<span class="xwikiteam-avatar-initials-letters" style="color: $escapedLetterAvatarFontColor">
12		- #foreach($firstLetter in $name.toUpperCase().split("[\s-]"))$escapetool.xml($firstLetter.charAt(0))#end
	12	+ #foreach($firstLetter in $name.toUpperCase().split("[\s\[\]-]+"))$escapetool.xml($firstLetter.charAt(0))#end
13	13	</span>
14	14	</span>
15	15	</span>
...	...	@@ -33,7 +33,7 @@
33	33	#else
34	34	#set($escapedSize = $escapetool.xml($size))
35	35	<img
36		- class='xwikiteam-avatar'
	36	+ class='xwikiteam-avatar fixedSize-$escapedSize'
37	37	src='$escapetool.xml($return.url)'
38	38	alt='$escapedDisplayUser'
39	39	title='$escapedDisplayUser'
...	...	@@ -45,8 +45,15 @@
45	45	</a>
46	46	</li>
47	47	#end
48		-#macro (addUsersFromWiki $list $wiki $limit)
49		- #set($l = $services.query.hql($hql).setLimit($limit).setWiki($wiki).execute())
	48	+#macro (addUsersFromWiki $list $wiki $limit $tag $userList)
	49	+ #set($q = $services.query.hql($hql).setLimit($limit).setWiki($wiki))
	50	+ #if ("$!tag" != "")
	51	+ #set($q = $q.bindValue('tag', $tag))
	52	+ #end
	53	+ #if(!$userList.empty)
	54	+ #set($q = $q.bindValue('users', $userList))
	55	+ #end
	56	+ #set($l = $q.execute())
50	50	#foreach($username in $l)
51	51	#set($discard = $list.add("$wiki:$username"))
52	52	#end
...	...	@@ -56,6 +56,7 @@
56	56	#set($discard = $xwiki.jsx.use('xwiki:XWiki.Macros.Team'))
57	57	#set($pictureList = {})
58	58	#set($tag = $wikimacro.parameters.tag)
	66	+ #set($users = $wikimacro.parameters.users)
59	59	#set($size = $wikimacro.parameters.size)
60	60	#set($scope = $wikimacro.parameters.scope)
61	61	#set($letterAvatarBgColor = $wikimacro.parameters.letterAvatarBgColor)
...	...	@@ -109,6 +109,13 @@
109	109	#if("$!limit" == "")
110	110	#set($limit = 100)
111	111	#end
	120	+ #if(!$users || $users == "")
	121	+ #set($userList = [])
	122	+ #set($userswhere = '')
	123	+ #else
	124	+ #set($userswhere = 'and doc.fullName in :users')
	125	+ #set($userList = $users.split(","))
	126	+ #end
112	112	#if(!$tag || $tag == "")
113	113	#set($tagselect = "")
114	114	#set($tagwhere = "")
...	...	@@ -124,7 +124,7 @@
124	124	obj3.className = 'XWiki.TagClass' and
125	125	obj3.id = tagprop.id.id and
126	126	tagprop.id.name = 'tags' and
127		- list = '$tag'
	142	+ list = :tag
128	128	")
129	129	#end
130	130	#set($hql = ",
...	...	@@ -145,21 +145,32 @@
145	145	prop.id.name = 'active' and
146	146	prop.value = 1
147	147	$tagwhere
	163	+ $userswhere
148	148	ORDER BY doc.name
149	149	")
150	150	#set($list = [])
151	151	#if ($scope == "global")
152		- #addUsersFromWiki($list $xcontext.mainWikiName $limit)
	168	+ #addUsersFromWiki($list $xcontext.mainWikiName $limit $tag $userList)
153	153	#elseif ($scope == "local")
154		- #addUsersFromWiki($list $services.wiki.currentWikiId $limit)
	170	+ #addUsersFromWiki($list $services.wiki.currentWikiId $limit $tag $userList)
155	155	#elseif ($scope == "both")
156		- #addUsersFromWiki($list $services.wiki.currentWikiId $limit)
	172	+ #addUsersFromWiki($list $services.wiki.currentWikiId $limit $tag $userList)
157	157	#if($list.size() < $limit)
158	158	#set($limit = $limit - $list.size())
159		- #addUsersFromWiki($list $xcontext.mainWikiName $limit)
	175	+ #addUsersFromWiki($list $xcontext.mainWikiName $limit $tag $userList)
160	160	#end
161	161	#end
162		- {{html wiki=false clean=false}}
	178	+ {{html clean=false}}
	179	+ ## Starting with XWiki 13.10.4 and 14.1, img tags have a 'height: auto' style set, see XWIKI-19432: Image not to scale
	180	+ ## on mobile. Since this breaks the macro fixed size feature, a specific size is added.
	181	+ #set ($escapedSize = $escapetool.xml($size))
	182	+ <div>
	183	+ <style>
	184	+ .fixedSize-$escapedSize {
	185	+ height: ${escapedSize}px;
	186	+ }
	187	+ </style>
	188	+ </div>
163	163	<div class="xwikiteam #if(!$showUsernames)xwikiteam-usernames-hidden#end">
164	164	#if ($list.size() > 0)
165	165	<ul class="xwikiteam-ul">
...	...	@@ -194,17 +194,13 @@
194	194	#end
195	195	{{/velocity}}
196	196
197		-{{include reference="Licenses.Code.VelocityMacros"/}}
198		-
199	199	{{velocity}}
200	200	## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
201	201	## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
202	202	## don't have view right on those pages.
203		-#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
	227	+#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
204	204	#executeMacro
205	205	#else
206		- {{error}}
207		- #getMissingLicenseMessage('proMacros.extension.name')
208		- {{/error}}
	230	+ {{missingLicenseMessage extensionName="proMacros.extension.name"/}}
209	209	#end
210	210	{{/velocity}}

Standardkategorie

...	...	@@ -1,1 +1,0 @@
1		-content

XWiki.WikiMacroParameterClass[10]

Parameter-Name

...	...	@@ -1,0 +1,1 @@
	1	+users

Parameter-Beschreibung

...	...	@@ -1,0 +1,1 @@
	1	+Comma-separated list of users to show.

Parameter verpflichtend

...	...	@@ -1,0 +1,1 @@
	1	+Nein