Changes for page MentionsMacro


on 2020-08-01 04:53


on 2020-12-02 06:26
Summary
Details
- XWiki.JavaScriptExtension[0]
-
- Code
-
... ... @@ -80,22 +80,14 @@ 80 80 '</li>', 81 81 outputTemplate: function (param) { 82 82 var editor = ckeditor.instances[name]; 83 - var currentWikiReference = xm.documentReference.extractReference(XWiki.EntityType.WIKI); 84 - 85 - // Compute an absolute reference containing the wiki reference even if the user is local. 86 - var documentReference = XWiki.Model.resolve(param.id, XWiki.EntityType.DOCUMENT); 87 - if (!documentReference.extractReference(XWiki.EntityType.WIKI)) { 88 - documentReference = documentReference.appendParent(currentWikiReference); 89 - } 90 - var serializedReference = XWiki.Model.serialize(documentReference); 91 91 editor.once('afterInsertHtml', function () { 92 92 editor.execCommand('xwiki-macro-insert', { 93 93 name: 'mention', 94 94 inline: true, 95 95 parameters: { 96 - reference: serializedReference,88 + reference: param.id, 97 97 style: 'FULL_NAME', 98 - anchor: getAnchor( serializedReference)90 + anchor: getAnchor(param.id) 99 99 } 100 100 }); 101 101 }); ... ... @@ -124,4 +124,3 @@ 124 124 }; 125 125 }); 126 126 }); 127 -
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,9 +1,10 @@ 1 1 {{velocity}} 2 2 #set ($reference = $wikimacro.parameters.reference) 3 3 #set ($style = $wikimacro.parameters.style) 4 -#set ($content = $services.mentions.format($reference.reference, $style)) 4 +#set ($type = "$!wikimacro.parameters.type") 5 +#set ($content = $services.mentions.format($reference.reference, $style, $type)) 5 5 #set ($anchor = $wikimacro.parameters.anchor) 6 -#set ($isCurrentUser = $xcontext.userReference == $reference.reference) 7 +#set ($isCurrentUser = $xcontext.userReference == $reference.reference && ($type == '' || $type == 'user')) 7 7 #set ($cssClasses = ['xwiki-mention', 'user']) 8 8 #if ($isCurrentUser) 9 9 #set ($discard = $cssClasses.add('self'))
- XWiki.WikiMacroParameterClass[3]
-
- Parameter description
-
... ... @@ -1,0 +1,1 @@ 1 +The type of mentioned actor. - Parameter name
-
... ... @@ -1,0 +1,1 @@ 1 +type - Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +java.lang.String