Samenvatting
-
Paginaeigenschappen (1 gewijzigd, 0 toegevoegd, 0 verwijderd)
-
Objecten (1 gewijzigd, 0 toegevoegd, 0 verwijderd)
Details
- Paginaeigenschappen
-
- Inhoud
-
... ... @@ -175,10 +175,8 @@ 175 175 (% class="gallery_actions" %)((( 176 176 #foreach ($action in $actions) 177 177 #set( $actionname = $services.localization.render("${translationPrefix}.actions.${action.name}") ) 178 - ## Escape the URL so that it cannot break out of the link syntax, whatever its origin. 179 - #set ($actionURL = $services.rendering.escape($action.url, 'xwiki/2.1')) 180 180 [[${services.icon.render($action.icon)}(% class="sr-only"%)${actionname}(%%)>>## 181 - path:${action URL}||class="tool ${action.name} $!{action.extraCssClass}"##179 + path:${action.url}||class="tool ${action.name} $!{action.extraCssClass}"## 182 182 title="${actionname}" #if($action.rel) rel="${action.rel}"#end]]## 183 183 #end 184 184 $!additionalContent ... ... @@ -270,10 +270,7 @@ 270 270 #_attachmentPicker_displayStartFrame({'cssClass' : "gallery_emptyChoice $!{dcssClass}", 'text' : $services.localization.render("${translationPrefix}.default"), 'value' : "${options.defaultValue}"} $currentValue) 271 271 #_attachmentPicker_displayAttachmentDetails($defaultAttachment $options) 272 272 #set ($returnURL = $escapetool.url($doc.getURL('view', $request.queryString))) 273 - #set ($selectURL = $targetDocument.getURL(${options.get('docAction')}, $escapetool.url({ 274 - "${options.get('classname')}_${options.get('object')}_${options.get('property')}": '', 275 - 'form_token': $!{services.csrf.getToken()} 276 - }))) 271 + #set ($selectURL = $targetDocument.getURL(${options.get('docAction')}, "${options.get('classname')}_${options.get('object')}_${options.get('property')}=&form_token=$!{services.csrf.getToken()}")) 277 277 #_attachmentPicker_displayEndFrame ([{'name' : 'select', 'url' : $selectURL, 'icon' : 'check', 'extraCssClass' : 'btn btn-xs btn-success'}]) 278 278 #end 279 279 {{/velocity}}
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -116,32 +116,14 @@ 116 116 #end 117 117 #end 118 118 #if ($attachmentRef) 119 - #set ($attachmentResource = $services.rendering.escape($services.model.serialize($attachmentRef, 'local'), 120 - 'xwiki/2.1')) 119 + #set ($attachmentResource = $services.model.serialize($attachmentRef, 'local')) 121 121 #else 122 122 #set ($attachmentResource = '') 123 123 #end 124 - #set ($escapedCssClass = $services.rendering.escape($!cssClass, 'xwiki/2.1')) 125 125 #if ($displayImage) 126 - (% class="${escapedCssClass}#if (!$attachment) hidden#end" %)(((## 127 - #if ("$!{attachmentResource}" != '' || $forceElement)## 128 - #if ($withLink)[[#{end}## 129 - [[image:${attachmentResource}$!{imageParams}]]## 130 - #if ($withLink)>>attach:${attachmentResource}||rel=lightbox]]#{end}## 131 - #{end}## 132 - )))## 124 + (% class="${services.rendering.escape($!cssClass, 'xwiki/2.1')}#if (!$attachment) hidden#end" %)(((#if ("$!{attachmentResource}" != '' || $forceElement)#if($withLink)[[#end[[image:$services.rendering.escape(${attachmentResource}, 'xwiki/2.1')$!{imageParams}]]#if($withLink)>>attach:$services.rendering.escape(${attachmentResource},'xwiki/2.1')||rel=lightbox]]#{end}#end)))## 133 133 #else 134 - (% class="${escapedCssClass}" %)## 135 - #if ("$!{attachmentResource}" != '' || $forceElement)## 136 - #if ($withLink)## 137 - [[attach:${attachmentResource}||rel=__blank]]## 138 - #{else}## 139 - (% class="displayed" %)## 140 - #if ($targetPermView)$!{services.rendering.escape($!{attachmentName}, 'xwiki/2.1')}#{else}Access Denied#{end}## 141 - (% %)## 142 - #{end}## 143 - #{end}## 144 - (%%)## 126 + (% class="${services.rendering.escape($!cssClass, 'xwiki/2.1')}" %)#if ("$!{attachmentResource}" != '' || $forceElement)#if ($withLink)[[attach:${attachmentResource}||rel=__blank]]#{else}(% class="displayed" %)#if($targetPermView)$!{services.rendering.escape($!{attachmentName}, 'xwiki/2.1')}#{else}Access Denied#{end}(% %)#{end}#end(%%)## 145 145 #end 146 146 #end 147 147