0 Votes

Changes for page Attachments

Last modified by Сергей Коршунов on 2025/09/03 11:22

From 2.1 to 1.1

From version 18.1

edited by Сергей Коршунов
on 2025/09/03 11:22

Change comment: Install extension [org.xwiki.platform:xwiki-platform-attachment-ui/17.7.0]

To version 2.1

edited by Сергей Коршунов
on 2022/02/09 16:13

Change comment: Install extension [org.xwiki.platform:xwiki-platform-attachment-ui/14.0]

Raw
Rendered

Summary

Page properties (1 modified, 0 added, 0 removed)
Objects (3 modified, 0 added, 0 removed)

Details

Page properties

Content

@@ -38,7 +38,7 @@
   * @param $targetAttachDocument the document to list/save attachments to
   * @param $options generic picker options
   *#
--#macro (_attachmentPicker_displayAttachmentGallery $targetDocument, $targetAttachDocument, $options)
++#macro (attachmentPicker_displayAttachmentGallery $targetDocument, $targetAttachDocument, $options)
    #set ($currentValue = $targetDocument.getValue($options.property))
    #if ("$!{targetAttachDocument.getAttachment($currentValue)}" == '')
      #set ($currentValue = "$!{options.defaultValue}")
@@ -45,19 +45,16 @@
    #end
    (% class="gallery" %)(((
    ## Only display the upload form if they have edit permission on targetAttachDocument
--  #_attachmentPicker_displayUploadForm($targetDocument, $targetAttachDocument, $options)
--  #_attachmentPicker_displayAttachmentGalleryEmptyValue($targetDocument, $targetAttachDocument, $options, $currentValue)
--  #if ("$!services.temporaryAttachments" != '')
--    #set ($unsortedAttachments = $services.temporaryAttachments.listAllAttachments($targetAttachDocument))
--    #set ($sortedAttachments = $collectiontool.sort($unsortedAttachments, "${options.sortAttachmentsBy}"))
--  #else
--    #set ($sortedAttachments = $collectiontool.sort($targetAttachDocument.getAttachmentList(), "${options.sortAttachmentsBy}") )
++  #if ($xwiki.hasAccessLevel('edit',$xcontext.user,${targetAttachDocument.fullName}))
++    #attachmentPicker_displayUploadForm($targetDocument, $targetAttachDocument, $options)
    #end
++  #attachmentPicker_displayAttachmentGalleryEmptyValue($targetDocument, $targetAttachDocument, $options, $currentValue)
++  #set ($sortedAttachments = $collectiontool.sort($targetAttachDocument.getAttachmentList(), "${options.sortAttachmentsBy}") )
    #foreach ($attachment in $sortedAttachments)
      #set ($extension = $attachment.getFilename())
      #set ($extension = $extension.substring($mathtool.add($extension.lastIndexOf('.'), 1)).toLowerCase())
      #if ($options.filter.size() == 0 || $options.filter.contains($extension))
--      #_attachmentPicker_displayAttachmentBox($attachment $targetDocument $targetAttachDocument, $options $currentValue)
++      #attachmentPicker_displayAttachmentBox($attachment $targetDocument $targetAttachDocument, $options $currentValue)
      #end
    #end
    )))
@@ -71,47 +71,19 @@
   * @param $options generic picker options
   * @param $currentValue the currently selected file, used for determining if the box should be highlighted as the current value
   *#
--#macro (_attachmentPicker_displayAttachmentBox $attachment $targetDocument $targetAttachDocument, $options $currentValue)
--  #set ($hasTemporaryAttachment = "$!services.temporaryAttachments" != '')
--  #set ($canEdit = $xwiki.hasAccessLevel('edit', $xcontext.user, ${targetAttachDocument.fullName}))
--  #set ($isTemporaryAttachment = false)
--  #if(!$hasTemporaryAttachment)
--    #set ($canDeleteAttachment = $canEdit)
++#macro (attachmentPicker_displayAttachmentBox $attachment $targetDocument $targetAttachDocument, $options $currentValue)
++  #if ($options.displayImage && $attachment.isImage())
++    #set ($cssClass = 'gallery_image')
    #else
--    #set ($isTemporaryAttachment = $services.temporaryAttachments.temporaryAttachmentExists($attachment))
--    ## TODO: Update once it is made possible to delete temporary attachments (see XWIKI-20225).
--    #set ($canDeleteAttachment = !$isTemporaryAttachment && $canEdit)
++    #set ($cssClass = '')
    #end
--  #set ($cssClasses = [])
--  #if ($options.displayImage && $attachment.isImage())
--    #set ($discard = $cssClasses.add('gallery_image'))
--  #end
--  #if ($isTemporaryAttachment)
--    #set ($discard = $cssClasses.add('temporary_attachment'))
--  #end
--  #_attachmentPicker_displayStartFrame({'value' : $attachment.filename, 'text' : $attachment.filename, 'cssClass' : "${stringtool.join($cssClasses, ' ')}"} $currentValue)
--  #_attachmentPicker_displayAttachmentDetails($attachment $options)
++  #attachmentPicker_displayStartFrame({'value' : $attachment.filename, 'text' : $attachment.filename, 'cssClass' : "$!{cssClass}"} $currentValue)
++  #attachmentPicker_displayAttachmentDetails($attachment $options)
    #set ($returnURL = $escapetool.url($doc.getURL('view', $request.queryString)))
    #set ($deleteURL = $targetAttachDocument.getAttachmentURL($attachment.filename, 'delattachment', "xredirect=${returnURL}&form_token=$!{services.csrf.getToken()}") )
    #set ($viewURL = $targetAttachDocument.getAttachmentURL($attachment.filename) )##{'name' : 'download', 'url' : $viewURL, 'rel' : '__blank'}
--  #set ($selectURL = $targetDocument.getURL(${options.get('docAction')}, $escapetool.url({
--    "${options.get('classname')}_${options.get('object')}_${options.get('property')}": ${attachment.filename},
--    'form_token': $!{services.csrf.getToken()}
--  })))
--  ## Delete action is only proposed for users with the edit right on the document.
--  ## If the temporary attachment is available, the delete action is only allowed for non-temporary attachments.
--  #set ($attachmentActions = [{'name' : 'select', 'url' : $selectURL, 'icon' : 'check', 'extraCssClass' : 'btn btn-xs btn-success'}])
--  #if($canDeleteAttachment)
--    #set ($discard = $attachmentActions.add({'name' : 'delete', 'url' : $deleteURL, 'icon' : 'cross', 'extraCssClass' : 'btn btn-xs btn-danger'}))
--  #end
--  #define($additionalContent)
--    #if ($isTemporaryAttachment)
--      #set ($titleMessage = $services.localization.render('attachment.attachmentSelector.attachmentBox.temporaryAttachmentTitle'))
--      #set ($titleMessage = $services.rendering.escape($titleMessage, 'xwiki/2.1'))
--      (% title="$titleMessage" %)$services.icon.render('clock')(%%)
--    #end
--  #end
--  #_attachmentPicker_displayEndFrame ($attachmentActions $additionalContent)
++  #set ($selectURL = $targetDocument.getURL(${options.get('docAction')}, "${options.get('classname')}_${options.get('object')}_${options.get('property')}=${attachment.filename}&form_token=$!{services.csrf.getToken()}"))
++  #attachmentPicker_displayEndFrame ([{'name' : 'select', 'url' : $selectURL}, {'name' : 'delete', 'url' : $deleteURL}])
  #end
  #**
@@ -121,12 +121,9 @@
   *        the title to display (boxOptions.text), optional extra CSS classnames to put on the box (boxOptions.cssClass)
   * @param $currentValue the currently selected file, used for determining if this attachment should be highlighted as the current value
   *#
--#macro (_attachmentPicker_displayStartFrame $boxOptions $currentValue)
++#macro (attachmentPicker_displayStartFrame $boxOptions $currentValue)
    (% class="gallery_attachmentbox $!{boxOptions.cssClass} #if ("$!{boxOptions.value}" == $currentValue) current#{end}" %)(((
--    (% class="gallery_attachmenttitle" title="$services.rendering.escape($!{boxOptions.value}, 'xwiki/2.1')" %)(((
--      #if($!{boxOptions.cssClass} == 'gallery_upload')$services.icon.render('add') #end##
--      $services.rendering.escape($boxOptions.text, 'xwiki/2.1')
--    )))
++    (% class="gallery_attachmenttitle" title="$!{boxOptions.value}" %)((($boxOptions.text)))
      (% class="gallery_attachmentframe" %)(((
  #end
@@ -137,18 +137,18 @@
   * @param $attachment the target attachment to display
   * @param $options generic picker options
   *#
--#macro (_attachmentPicker_displayAttachmentDetails $attachment $options)
++#macro (attachmentPicker_displayAttachmentDetails $attachment $options)
    #if ($attachment)
      ## Compute the attachment reference because there's no getter.
      #set ($attachmentReference = $services.model.createAttachmentReference($attachment.document.documentReference,
        $attachment.filename))
--    #set ($attachmentStringReference = $services.rendering.escape($services.model.serialize($attachmentReference, 'default'), 'xwiki/2.1'))
++    #set ($attachmentStringReference = $services.model.serialize($attachmentReference, 'default'))
      #if ($attachment.isImage() && $options.displayImage)
        ## We add the version to the query string in order to invalidate the cache when an image attachment is replaced.
        #set ($queryString = $escapetool.url({'version': $attachment.version}))
        [[[[image:${attachmentStringReference}||width=180 queryString="$queryString"]]>>attach:$attachmentStringReference]]
      #else
--      * (% class="mime" %){{html wiki=false clean=false}}#mimetypeimg($attachment.getMimeType().toLowerCase() $attachment.getFilename().toLowerCase()){{/html}}(%%) (% class="filename" %)$services.rendering.escape($attachment.getFilename(), 'xwiki/2.1')(% %)
++      * (% class="mime" %){{html wiki=false clean=false}}#mimetypeimg($attachment.getMimeType().toLowerCase() $attachment.getFilename().toLowerCase()){{/html}}(%%) (% class="filename" %)$attachment.getFilename()(% %)
        * v$attachment.getVersion() (#dynamicsize($attachment.longSize))
        * $services.localization.render('core.viewers.attachments.author', [$!{xwiki.getUserName($attachment.author, false)}]) $services.localization.render('core.viewers.attachments.date', [$!{xwiki.formatDate($attachment.date, 'dd/MM/yyyy hh:mm')}])
        * (% class="buttonwrapper" %)[[${services.localization.render("${translationPrefix}.actions.download")}>>attach:${attachmentStringReference}||title="$services.localization.render("${translationPrefix}.actions.download")" rel="__blank" class="button"]](%%)
@@ -168,18 +168,14 @@
   *          <dt>rel</dt>
   *          <dd>an optional parameter to be used in the "rel" HTML attribute; for example "__blank" can be used to open the link in a new tab/window</dd>
   *        </dl>
-- * @param $additionalContent optional additional content that does not follow the structure of the actions
   *#
--#macro (_attachmentPicker_displayEndFrame $actions $additionalContent)
++#macro (attachmentPicker_displayEndFrame $actions)
      )))## attachmentframe
      (% class="gallery_actions" %)(((
        #foreach ($action in $actions)
          #set( $actionname = $services.localization.render("${translationPrefix}.actions.${action.name}") )
--        [[${services.icon.render($action.icon)}(% class="sr-only"%)${actionname}(%%)>>##
--          path:${action.url}||class="tool ${action.name} $!{action.extraCssClass}"##
--          title="${actionname}" #if($action.rel) rel="${action.rel}"#end]]##
++        [[${actionname}>>path:${action.url}||class="tool ${action.name}" title="${actionname}" #if($action.rel) rel="${action.rel}"#end]]##
        #end
--      $!additionalContent
      )))## actions
    )))## attachmentbox
  #end
@@ -191,8 +191,8 @@
   * @param $targetAttachDocument the document to upload the attachment to
   * @param $options generic picker options
   *#
--#macro (_attachmentPicker_displayUploadForm $targetDocument, $targetAttachDocument, $options)
--#_attachmentPicker_displayStartFrame({
++#macro (attachmentPicker_displayUploadForm $targetDocument, $targetAttachDocument, $options)
++#attachmentPicker_displayStartFrame({
     'value' : $services.localization.render("${translationPrefix}.upload.title"),
     'text' : $services.localization.render("${translationPrefix}.upload.title"),
     'cssClass' : 'gallery_upload'
@@ -239,7 +239,7 @@
    </div>
  </form>
  {{/html}}
--#_attachmentPicker_displayEndFrame ([])
++#attachmentPicker_displayEndFrame ([])
  #end
  #**
@@ -250,7 +250,7 @@
   * @param $options generic picker options
   * @param $currentValue the currently selected file, used for determining if the empty box should be highlighted as the current value
   *#
--#macro (_attachmentPicker_displayAttachmentGalleryEmptyValue $targetDocument, $targetAttachDocument, $options, $currentValue)
++#macro (attachmentPicker_displayAttachmentGalleryEmptyValue $targetDocument, $targetAttachDocument, $options, $currentValue)
    #if ("$!{options.get('defaultValue')}" != '')
      #set ($reference = ${options.get('defaultValue')})
      #set ($docNameLimit = $reference.indexOf('@'))
@@ -265,11 +265,11 @@
        #set($dcssClass = 'gallery_image')
      #end
    #end
--  #_attachmentPicker_displayStartFrame({'cssClass' : "gallery_emptyChoice $!{dcssClass}", 'text' : $services.localization.render("${translationPrefix}.default"), 'value' : "${options.defaultValue}"} $currentValue)
--  #_attachmentPicker_displayAttachmentDetails($defaultAttachment $options)
++  #attachmentPicker_displayStartFrame({'cssClass' : "gallery_emptyChoice $!{dcssClass}", 'text' : $services.localization.render("${translationPrefix}.default"), 'value' : "${options.defaultValue}"} $currentValue)
++  #attachmentPicker_displayAttachmentDetails($defaultAttachment $options)
    #set ($returnURL = $escapetool.url($doc.getURL('view', $request.queryString)))
    #set ($selectURL = $targetDocument.getURL(${options.get('docAction')}, "${options.get('classname')}_${options.get('object')}_${options.get('property')}=&form_token=$!{services.csrf.getToken()}"))
--  #_attachmentPicker_displayEndFrame ([{'name' : 'select', 'url' : $selectURL, 'icon' : 'check', 'extraCssClass' : 'btn btn-xs btn-success'}])
++  #attachmentPicker_displayEndFrame ([{'name' : 'select', 'url' : $selectURL}])
  #end
  {{/velocity}}
@@ -334,12 +334,10 @@
      'versionSummary': $request.versionSummary.equals('true')
    })
    $!targetDocument.use($targetDocument.getObject($options.classname, $options.object))##
--  #_attachmentPicker_displayAttachmentGallery($targetDocument, $targetAttachDocument, $options)
++  #attachmentPicker_displayAttachmentGallery($targetDocument, $targetAttachDocument, $options)
--  #set ($cancelLinkName = $services.rendering.escape($services.rendering.escape($services.localization.render("${translationPrefix}.cancel"), 'xwiki/2.1'), 'xwiki/2.1'))
--  #set ($cancelLinkTarget = $services.rendering.escape($services.model.serialize($targetDocument), 'xwiki/2.1'))
    (% class="gallery_buttons buttons" %)(((
--  (% class="buttonwrapper secondary" %)[[$cancelLinkName>>$cancelLinkTarget||class="button secondary" id="attachment-picker-close"]]
++  (% class="buttonwrapper secondary" %)[[$services.localization.render("${translationPrefix}.cancel")>>${targetDocument}||class="button secondary" id="attachment-picker-close"]]
    )))
  #end
  {{/velocity}}

XWiki.JavaScriptExtension[0]

Code

@@ -1,66 +1,4 @@
  var XWiki = (function(XWiki) {
--  function uploadTemporaryAttachment() {
--    // Require jquery locally until we are able to fully migrate this code away from prototype.
--    const form = this.property.up('form');
--    require(['jquery'], function ($) {
--      const data = new FormData();
--      const uploadedFile = $('#attachfile')[0].files[0];
--      const filenameCheckbox = $("#uploadAttachment input[name='filename']");
--
--      // TODO: Fix replace currently selected checkbox (see XWIKI-20181).
--      data.append('upload', uploadedFile);
--      const notification = new XWiki.widgets.Notification(
--        "$services.localization.render('xe.attachmentSelector.upload.inProgress')", 'inprogress');
--      const params = {
--        'form_token': $(form).find('[name="form_token"]').val(),
--        'sheet': 'CKEditor.FileUploader',
--        'outputSyntax': 'plain'
--      };
--
--      // Update the name of the file with the name of the currently selected attachment if required.
--      if (filenameCheckbox.prop('checked')) {
--        params['filename'] = filenameCheckbox.val()
--      }
--
--      $.ajax({
--        'url': XWiki.currentDocument.getURL('get', new URLSearchParams(params).toString()),
--        method: 'POST',
--        data: data,
--        processData: false,
--        contentType: false, // Sets the 'multipart/form-data' automatically
--        headers: {
--          'X-XWiki-Temporary-Attachment-Support': true
--        }
--      }).done(function (response) {
--        #set ($successMessage = $escapetool.javascript($services.localization.render('attachment.attachmentSelector.temporaryUpload.success')))
--        notification.replace(new XWiki.widgets.Notification("$successMessage", 'done'));
--        // Add a field with the name of the uploaded file so that it is moved from the temporary
--        // attachments to the persisded ones on save.
--        $(form).append($('<input/>')
--          .prop('type', 'hidden')
--          .prop('name', 'uploadedFiles')
--          .prop('value', response.fileName))
--        $(form).find('input[type="hidden"].property-reference').prop('value', response.fileName);
--        this.updateAttachment(response.fileName, response.url);
--        this.dialog.closeDialog();
--      }.bind(this)).fail(function  () {
--        #set ($errorMessage = $escapetool.javascript($services.localization.render('attachment.attachmentSelector.temporaryUpload.failure')))notification.replace(new XWiki.widgets.Notification("$errorMessage", 'error'));
--      });
--    }.bind(this));
--  }
--
--  function directUploadAttachment(uploadForm) {
--    // FIXME This fails in HTML5, will deal with it later:
--    // this.property.down('input').value = uploadForm.down('input[type="file"]').value;
--    // uploadForm.xredirect.value = window.location.pathname;
--    document.observe('xwiki:document:saved', function () {
--      new XWiki.widgets.Notification("$services.localization.render('xe.attachmentSelector.upload.inProgress')",
--        'inprogress');
--      uploadForm.submit();
--    })
--    document.fire('xwiki:actions:save', {'continue': true, form: this.property.up('form')});
--  }
--
    /** Handles the gallery buttons directly in the current page without reloading the window. */
    XWiki.AttachmentPicker = Class.create({
      /**
@@ -122,23 +122,21 @@
              new XWiki.widgets.Notification("$services.localization.render('xe.attachmentSelector.upload.error.badExtension')", 'error');
              hasErrors = true;
            }
--          const beforeUploadEvent = Event.fire(document, 'xwiki:actions:beforeUpload', {
--            file: fileInput.files[0]
--          });
--
--          if (beforeUploadEvent.defaultPrevented) {
--            hasErrors = true;
--          }
          }.bind(this));
++        // No form submission by AJAX right now, because file uploads can't be done this way without HTML5, this is future work
++        // Save the document before submitting, since the current form data will be lost otherwise
          if (!hasErrors) {
            if (this.directSave) {
              uploadForm.submit();
            } else {
--            if ("$!services.temporaryAttachments" != '') {
--              uploadTemporaryAttachment.call(this);
--            } else {
--              directUploadAttachment.call(this, uploadForm);
--            }
++            // FIXME This fails in HTML5, will deal with it later:
++            // this.property.down('input').value = uploadForm.down('input[type="file"]').value;
++            // uploadForm.xredirect.value = window.location.pathname;
++            document.observe('xwiki:document:saved', function() {
++              new XWiki.widgets.Notification("$services.localization.render('xe.attachmentSelector.upload.inProgress')", 'inprogress');
++              uploadForm.submit();
++            })
++            document.fire('xwiki:actions:save', {'continue': true, form: this.property.up('form')});
            }
          }
        }.bindAsEventListener(this));

XWiki.StyleSheetExtension[0]

Code

@@ -25,12 +25,9 @@
    margin: 0;
  }
  .gallery_attachmentbox {
--  display: grid;
--  gap: .2rem;
    background: $theme.pageContentBackgroundColor;
--  padding: .2rem;
    border: 1px solid $theme.borderColor;
--  border-radius: var(--border-radius-base);
++  border-radius: 5px;
    float: left;
    margin: ${boxMargin}px;
    overflow: hidden;
@@ -39,6 +39,8 @@
  }
  .gallery .current {
    background-color: $theme.highlightColor;
++  border-width: 3px;
++  margin: 3px;
  }
  .gallery .current .gallery_attachmenttitle {
    font-weight: bold;
@@ -48,7 +48,9 @@
  }
  .gallery_attachmenttitle {
--  grid-area: 1 / 1 / 2 / 2;
++  background: $theme.backgroundSecondaryColor;
++  border-bottom: 1px dotted $theme.borderColor;
++  border-radius: 5px 5px 0px 0px;
    font-size: 85%;
    padding: 3px ${boxPadding}px;
    overflow: hidden;
@@ -61,7 +61,7 @@
  }
  .gallery_attachmentframe {
--  grid-area: 2 / 1 / 3 / 3;
++  padding: ${boxPadding}px;
    height: ${imgSize}px;
    overflow: hidden;
    position: relative;
@@ -100,16 +100,39 @@
  }
  /* Actions */
--.gallery_actions p {
--  grid-area: 1 / 2 / 2 / 3;
--  display: flex;
--  justify-content: flex-end;
--  gap: .2rem;
++.gallery_actions {
++  width: auto;
++  position: absolute;
++  bottom: 0px;
++  right: ${boxPadding}px;
  }
  .gallery_actions .tool {
++  background: none no-repeat 50% transparent;
    cursor: pointer;
    display: block;
++  float: left;
++  height: ${actionsHeight}px;
++  padding: 0 !important;
++  overflow: hidden;
++  text-indent: -1000em;
++  opacity: 0.6;
++  width: ${actionsWidth}px;
  }
++.gallery_actions .tool:hover {
++  opacity: 1;
++}
++.gallery_actions .select {
++  background-image: url("$xwiki.getSkinFile('icons/silk/tick.png')");
++}
++.gallery_actions .delete {
++  background-image: url("$xwiki.getSkinFile('icons/silk/cross.png')");
++}
++.gallery_actions .view {
++  background-image: url("$xwiki.getSkinFile('icons/silk/link.png')");
++}
++.gallery_actions .download {
++  background-image: url("$xwiki.getSkinFile('icons/silk/arrow_down.png')");
++}
  /*--------------------------------------------------*/
  /* Upload form                                      */
  .gallery_upload {
@@ -120,6 +120,12 @@
    background-color: $theme.backgroundSecondaryColor;
  }
++.gallery_upload .gallery_attachmenttitle {
++  background-position: 1px center;
++  background-image: url("$xwiki.getSkinFile('icons/silk/bullet_add.png')");
++  background-repeat: no-repeat;
++  padding-left: 16px;
++}
  .gallery_upload .gallery_attachmentframe {
    height: auto;
  }

XWiki.WikiMacroClass[0]

Macro code

@@ -33,7 +33,7 @@
  #set ($property = "$!{xcontext.macro.params.property}")
  #set ($object = $numbertool.toNumber("$!{xcontext.macro.params.object}").intValue())
  #if ("$!{object}" != $!{xcontext.macro.params.object})
--  #set ($object = ${targetdoc.getObject($classname).number})
++  #set ($object = ${doc.getObject($classname).number})
    #if ("$!{object}" == '')
      #set ($object = 0)
    #end
@@ -45,18 +45,9 @@
    #set ($displayImage = false)
  #end
  #if ($displayImage)
--  #set ($alt = '')
--  #set ($width = '')
--  #set ($height = '')
--  #if ($xcontext.macro.params.alternateText)
--    #set ($alt = "$services.rendering.escape($!{xcontext.macro.params.alternateText}, 'xwiki/2.1')")
--  #end
--  #if ($xcontext.macro.params.width)
--    #set ($width = "$services.rendering.escape($!{xcontext.macro.params.width}, 'xwiki/2.1')")
--  #end
--  #if ($xcontext.macro.params.height)
--    #set ($height = "$services.rendering.escape($!{xcontext.macro.params.height}, 'xwiki/2.1')")
--  #end
++  #set ($alt = "$!{xcontext.macro.params.alternateText}")
++  #set ($width = "$!{xcontext.macro.params.width}")
++  #set ($height = "$!{xcontext.macro.params.height}")
    #set ($imageParams = '')
    #if ("${width}" != '')
      #set($imageParams = "$!{imageParams} width=${width}")
@@ -94,10 +94,10 @@
    #set ($savemode = 'form')
  #end
--#set ($propValue = "$!{targetdoc.getObject($classname, $object).getProperty($property).value}")
++#set ($propValue = "$!{doc.getObject($classname, $object).getProperty($property).value}")
  ##
--#macro (_attachmentPicker_displayAttachment $name $displayImage $withLink $forceElement)
++#macro (attachmentPicker_displayAttachment $name $displayImage $withLink $forceElement)
    #set ($attachment = $targetdoc.getAttachment("$!{name}"))
    #if ("$!{name}" != '' && "$!{attachment}" != '')
      #set ($attachmentRef = $services.model.createAttachmentReference(${targetdoc.documentReference}, ${name}))
@@ -121,9 +121,9 @@
      #set ($attachmentResource = '')
    #end
    #if ($displayImage)
--    (% class="$!{cssClass}#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)))##
++    (% class="$!{cssClass}#if (!$attachment) hidden#end" %)(((#if ("$!{attachmentResource}" != '' || $forceElement)#if($withLink)[[#end[[image:${attachmentResource}$!{imageParams}]]#if($withLink)>>attach:${attachmentResource}||rel=lightbox]]#{end}#end)))##
    #else
--      (% class="$!{cssClass}" %)#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(%%)##
++    (% class="$!{cssClass}" %)#if ("$!{attachmentResource}" != '' || $forceElement)#if ($withLink)[[attach:${attachmentResource}||rel=__blank]]#{else}(% class="displayed" %)#if($targetPermView)$!{attachmentName}#{else}Access Denied#{end}(% %)#{end}#end(%%)##
    #end
  #end
@@ -130,8 +130,8 @@
  ## Display the "Choose an attachment" button if they can:
  ##  1. Edit the current page
  ##  2. View the target attachment page. (can be the same page)
--#macro (_attachmentPicker_displayButton)
--  #if ($targetPermView)
++#macro (attachmentPicker_displayButton)
++  #if ($hasEdit && $targetPermView)
      #set ($queryString = {
        'docname': $doc.fullName,
        'classname': $classname,
@@ -146,9 +146,8 @@
      #if ($hasTargetDoc)
        #set ($queryString.targetdocname = $targetdoc.fullName)
      #end
--    #set ($linkLabel = $services.rendering.escape($services.rendering.escape($buttontext, 'xwiki/2.1'), 'xwiki/2.1'))
--    (% class="buttonwrapper" %)[[$linkLabel>>${xcontext.macro.doc.fullName}||queryString="$escapetool.url($queryString)"
--      class="attachment-picker-start button" title="$services.rendering.escape($buttontext, 'xwiki/2.1')"]](%%)##
++    (% class="buttonwrapper" %)[[$buttontext>>${xcontext.macro.doc.fullName}||queryString="$escapetool.url($queryString)"
++      class="attachment-picker-start button" title="$buttontext"]](%%)##
    #end
  #end
  {{/velocity}}
@@ -155,13 +155,13 @@
  {{velocity}}
  #if ("${savemode}" == 'direct')
--  (% class="attachment-picker" %)(((#_attachmentPicker_displayAttachment($propValue $displayImage $link true) #_attachmentPicker_displayButton())))
++  (% class="attachment-picker" %)(((#attachmentPicker_displayAttachment($propValue $displayImage $link true) #attachmentPicker_displayButton())))
  #elseif ($xcontext.action == 'inline' || $xcontext.action == 'edit')
    (% class="attachment-picker" %)(((##
--    #_attachmentPicker_displayAttachment($propValue $displayImage false true) #_attachmentPicker_displayButton()##
--    {{html}}<input type="hidden" name="$escapetool.xml("${classname}_${object}_${property}")" value="$escapetool.xml("${propValue}")" class="property-reference"/>{{/html}}##
++    #attachmentPicker_displayAttachment($propValue $displayImage false true) #attachmentPicker_displayButton()##
++    {{html}}<input type="hidden" name="${classname}_${object}_${property}" value="${propValue}"/>{{/html}}##
    )))
  #else
--  #_attachmentPicker_displayAttachment($propValue $displayImage $link false)
++  #attachmentPicker_displayAttachment($propValue $displayImage $link false)
  #end
  {{/velocity}}

Default category

...	...	@@ -1,0 +1,1 @@
	1	+Development

Default categories

...	...	@@ -1,1 +1,0 @@
1		-Development

Changes for page Attachments

Summary

Details

Applications

Navigation

My Recent Modifications

Need help?