Änderungen von Dokument Team
Zuletzt geändert von xwikiadmin am 2024/06/24 15:04
Von Version 3.1
bearbeitet von xwikiadmin
am 2023/10/26 10:38
am 2023/10/26 10:38
Änderungskommentar:
Install extension [com.xwiki.pro:xwiki-pro-macros/1.12]
Auf Version 2.1
bearbeitet von xwikiadmin
am 2023/10/26 09:30
am 2023/10/26 09:30
Änderungskommentar:
Migrated property [type] from class [XWiki.WikiMacroParameterClass]
Zusammenfassung
-
Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)
-
Objekte (1 geändert, 0 hinzugefügt, 1 gelöscht)
Details
- Seiteneigenschaften
-
- Inhalt
-
... ... @@ -4,7 +4,6 @@ 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'/}} | 8 8 | size | {{translation key='rendering.macro.team.parameter.size.name'/}} | {{translation key='rendering.macro.team.parameter.size.description'/}} | 60 9 9 | showUsernames | {{translation key='rendering.macro.team.parameter.showUsernames.name'/}} | {{translation key='rendering.macro.team.parameter.showUsernames.description'/}} | false 10 10 | 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))#end12 + #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 fixedSize-$escapedSize'36 + class='xwikiteam-avatar' 37 37 src='$escapetool.xml($return.url)' 38 38 alt='$escapedDisplayUser' 39 39 title='$escapedDisplayUser' ... ... @@ -45,15 +45,8 @@ 45 45 </a> 46 46 </li> 47 47 #end 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()) 48 +#macro (addUsersFromWiki $list $wiki $limit) 49 + #set($l = $services.query.hql($hql).setLimit($limit).setWiki($wiki).execute()) 57 57 #foreach($username in $l) 58 58 #set($discard = $list.add("$wiki:$username")) 59 59 #end ... ... @@ -63,7 +63,6 @@ 63 63 #set($discard = $xwiki.jsx.use('xwiki:XWiki.Macros.Team')) 64 64 #set($pictureList = {}) 65 65 #set($tag = $wikimacro.parameters.tag) 66 - #set($users = $wikimacro.parameters.users) 67 67 #set($size = $wikimacro.parameters.size) 68 68 #set($scope = $wikimacro.parameters.scope) 69 69 #set($letterAvatarBgColor = $wikimacro.parameters.letterAvatarBgColor) ... ... @@ -117,13 +117,6 @@ 117 117 #if("$!limit" == "") 118 118 #set($limit = 100) 119 119 #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 127 127 #if(!$tag || $tag == "") 128 128 #set($tagselect = "") 129 129 #set($tagwhere = "") ... ... @@ -139,7 +139,7 @@ 139 139 obj3.className = 'XWiki.TagClass' and 140 140 obj3.id = tagprop.id.id and 141 141 tagprop.id.name = 'tags' and 142 - list = ' :tag'127 + list = '$tag' 143 143 ") 144 144 #end 145 145 #set($hql = ", ... ... @@ -160,32 +160,21 @@ 160 160 prop.id.name = 'active' and 161 161 prop.value = 1 162 162 $tagwhere 163 - $userswhere 164 164 ORDER BY doc.name 165 165 ") 166 166 #set($list = []) 167 167 #if ($scope == "global") 168 - #addUsersFromWiki($list $xcontext.mainWikiName $limit $tag $userList)152 + #addUsersFromWiki($list $xcontext.mainWikiName $limit) 169 169 #elseif ($scope == "local") 170 - #addUsersFromWiki($list $services.wiki.currentWikiId $limit $tag $userList)154 + #addUsersFromWiki($list $services.wiki.currentWikiId $limit) 171 171 #elseif ($scope == "both") 172 - #addUsersFromWiki($list $services.wiki.currentWikiId $limit $tag $userList)156 + #addUsersFromWiki($list $services.wiki.currentWikiId $limit) 173 173 #if($list.size() < $limit) 174 174 #set($limit = $limit - $list.size()) 175 - #addUsersFromWiki($list $xcontext.mainWikiName $limit $tag $userList)159 + #addUsersFromWiki($list $xcontext.mainWikiName $limit) 176 176 #end 177 177 #end 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> 162 + {{html wiki=false clean=false}} 189 189 <div class="xwikiteam #if(!$showUsernames)xwikiteam-usernames-hidden#end"> 190 190 #if ($list.size() > 0) 191 191 <ul class="xwikiteam-ul"> - Standardkategorie
-
... ... @@ -1,0 +1,1 @@ 1 +content
- XWiki.WikiMacroParameterClass[10]
-
- Parameter-Beschreibung
-
... ... @@ -1,1 +1,0 @@ 1 -Comma-separated list of users to show. - Parameter verpflichtend
-
... ... @@ -1,1 +1,0 @@ 1 -Nein - Parameter-Name
-
... ... @@ -1,1 +1,0 @@ 1 -users