Changes for page Main

Last modified by Administrator on 2023/03/27 10:53

From 1.1 to 2.1 From 3.1 to 4.1

From version

2.1

edited by Administrator
on 2019/11/04 23:53

Change comment: Install extension [org.xwiki.platform:xwiki-platform-appwithinminutes-ui/10.11.9]

To version

3.1

edited by Administrator
on 2020/01/07 18:45

Change comment: Install extension [org.xwiki.platform:xwiki-platform-appwithinminutes-ui/11.10.2]

Raw
Rendered

Summary

Page properties (3 modified, 0 added, 0 removed)
Objects (1 modified, 0 added, 0 removed)
- XWiki.JavaScriptExtension[2]

Details

Page properties

Title

@@ -1,1 +1,1 @@
--#if(!$doc.name.endsWith('Sheet'))$services.localization.render('appWithinMinutes.classEditor.title', [$stringtool.removeEnd($doc.title, 'Class').trim()])#{else}$doc.name#end
++#if ("$!appTitle" != '')$appTitle#else$doc.pageReference.name#end

Syntax

@@ -1,1 +1,1 @@
--XWiki 2.0
++XWiki 2.1

Content

@@ -1,3 +1,5 @@
++{{include reference="AppWithinMinutes.VelocityMacros" /}}
++
  {{groovy}}
  import com.xpn.xwiki.XWikiContext;
  import com.xpn.xwiki.api.Context;
@@ -52,99 +52,100 @@
  #**
   * Displays the field palette.
   *#
--#macro(displayFieldPalette)
--  (% id="palette" %)
--  (((
--    **$services.localization.render('platform.appwithinminutes.classEditorPaletteTitle')**
--
--    (% class="xHint" %)
--    $services.localization.render('platform.appwithinminutes.classEditorPaletteHint')
--
++#macro (displayFieldPalette)
++  <div id="palette">
++    <p><strong>$services.localization.render('platform.appwithinminutes.classEditorPaletteTitle')</strong></p>
++    <p class="xHint">$services.localization.render('platform.appwithinminutes.classEditorPaletteHint')</p>
      ## List all form field types, grouped by category.
--    #set($formFieldDocs = [])
--    #set($formFieldClassName = 'AppWithinMinutes.FormFieldClass')
--    #set($categoryListStatement = 'from doc.object(AppWithinMinutes.FormFieldCategoryClass) as category order by category.priority')
--    #foreach($category in $services.query.xwql($categoryListStatement).execute())
--      #set($categoryDoc = $xwiki.getDocument($category))
--      * (% class="category" %)$categoryDoc.plainTitle
--        #set($formFieldsForCategoryStatement = "from doc.object($formFieldClassName) as field where field.category = :category order by field.priority")
--        #set($formFieldsForCategoryQuery = $services.query.xwql($formFieldsForCategoryStatement).bindValue('category', $category))
--        #foreach($formField in $formFieldsForCategoryQuery.execute())
--          #set($formFieldDoc = $xwiki.getDocument($formField))
--          #set($discard = $formFieldDocs.add($formFieldDoc))
--          #set($formFieldIcon = $formFieldDoc.getObject($formFieldClassName).getProperty('icon').value)
--          #set($formFieldIconRendered = $services.icon.renderHTML($formFieldIcon))
++    #set ($formFieldDocs = [])
++    #set ($formFieldClassName = 'AppWithinMinutes.FormFieldClass')
++    #set ($categoryListStatement = 'from doc.object(AppWithinMinutes.FormFieldCategoryClass) as category order by category.priority')
++    <ul>
++    #foreach ($category in $services.query.xwql($categoryListStatement).execute())
++      #set ($categoryDoc = $xwiki.getDocument($category))
++      <li>
++        <div class="category">$categoryDoc.plainTitle</div>
++        #set ($formFieldsForCategoryStatement = "from doc.object($formFieldClassName) as field where field.category = :category order by field.priority")
++        #set ($formFieldsForCategoryQuery = $services.query.xwql($formFieldsForCategoryStatement).bindValue('category', $category))
++        <ul>
++        #foreach ($formField in $formFieldsForCategoryQuery.execute())
++          #set ($formFieldDoc = $xwiki.getDocument($formField))
++          #set ($discard = $formFieldDocs.add($formFieldDoc))
++          #set ($formFieldIcon = $formFieldDoc.getObject($formFieldClassName).getProperty('icon').value)
++          #set ($formFieldIconRendered = $services.icon.renderHTML($formFieldIcon))
            #if ("$!formFieldIconRendered" == "")
--            #if($formFieldIcon.contains('/'))
--              #set($formFieldIconURL = $xwiki.getSkinFile($formFieldIcon))
++            #if ($formFieldIcon.contains('/'))
++              #set ($formFieldIconURL = $xwiki.getSkinFile($formFieldIcon))
              #else
--              #set($formFieldIconURL = $formFieldDoc.getAttachmentURL($formFieldIcon))
++              #set ($formFieldIconURL = $formFieldDoc.getAttachmentURL($formFieldIcon))
              #end
--            #set($formFieldIconRendered = "<img src='$formFieldIconURL' alt='$escapetool.xml($formFieldDoc.plainTitle)' class='icon' />")
++            #set ($formFieldIconRendered = "<img src='$formFieldIconURL' alt='$escapetool.xml($formFieldDoc.plainTitle)' class='icon' />")
            #end
--          ** (% class="field" %){{html}}
--              $formFieldIconRendered
--              $escapetool.xml($formFieldDoc.plainTitle)
--              ## FIXME: We should use the 'get' action instead to prevent the stats module from recording this AJAX request.
--              ## The 'edit' action is a temporary solution until the sheet module is modified to allow a sheet to be enforced through
--              ## the query string even if it doesn't match the action (e.g. the 'get' action).
--              ## The sheet parameter is required when editing a new class because the request will be made to a document that doesn't exist.
--              ## FIXME2: In the future don't force the text editor type and instead use the default editor. This means
--              ## that if the WYSIWYG editor is used, we'll need to convert the HTML into the target syntax so that the
--              ## Template in #updateAndSaveTemplate is saved with target syntax and not HTML.
--              ## See https://jira.xwiki.org/browse/XWIKI-13789
--              <input type="hidden" value="$doc.getURL('edit', "xpage=plain&sheet=AppWithinMinutes.ClassEditSheet&field=$escapetool.url($formFieldDoc.fullName)&xeditmode=text")" class="data"/>
--            {{/html}}
++          <li class="field">
++            $formFieldIconRendered
++            $escapetool.xml($formFieldDoc.plainTitle)
++            ## FIXME: We should use the 'get' action instead to prevent the stats module from recording this AJAX request.
++            ## The 'edit' action is a temporary solution until the sheet module is modified to allow a sheet to be enforced through
++            ## the query string even if it doesn't match the action (e.g. the 'get' action).
++            ## The sheet parameter is required when editing a new class because the request will be made to a document that doesn't exist.
++            ## FIXME2: In the future don't force the text editor type and instead use the default editor. This means
++            ## that if the WYSIWYG editor is used, we'll need to convert the HTML into the target syntax so that the
++            ## Template in #updateAndSaveTemplate is saved with target syntax and not HTML.
++            ## See https://jira.xwiki.org/browse/XWIKI-13789
++            #set ($fieldURL = $doc.getURL('edit', $escapetool.url({
++              'xpage': 'plain',
++              'sheet': 'AppWithinMinutes.ClassEditSheet',
++              'field': $formFieldDoc.fullName,
++              'xeditmode': 'text'
++            })))
++            <input type="hidden" value="$fieldURL" class="data"/>
++          </li>
          #end
++        </ul>
++      </li>
      #end
--  )))
++    </ul>
++  </div>
  #end
  #**
   * Displays the field canvas.
   *#
--#macro(displayFieldCanvas)
--  #set($propertyType2FormField = {})
--  #foreach($formFieldDoc in $formFieldDocs)
++#macro (displayFieldCanvas)
++  #set ($propertyType2FormField = {})
++  #foreach ($formFieldDoc in $formFieldDocs)
      ## Use the type of the field template.
--    #set($type = $formFieldDoc.getxWikiClass().properties.get(0).classType)
--    #set($discard = $propertyType2FormField.put($type, $formFieldDoc))
++    #set ($type = $formFieldDoc.getxWikiClass().properties.get(0).classType)
++    #set ($discard = $propertyType2FormField.put($type, $formFieldDoc))
    #end
--  (% id="canvas" %)
--  (((
--    (% class="hint" %)
--    $services.localization.render('platform.appwithinminutes.classEditorCanvasHint')
--
--    #set($unknownFields = [])
--    #set($empty = true)
--    #foreach ($field in $doc.getxWikiClass().properties)
--      #set($formFieldDoc = $propertyType2FormField.get($field.classType))
--      #if($formFieldDoc)
--        #set($empty = false)
--        * (((#displayField($field $formFieldDoc))))
--      #else
--        #set($discard = $unknownFields.add($field))
++  <div id="canvas">
++    <p class="hint">
++      $services.localization.render('platform.appwithinminutes.classEditorCanvasHint')
++    </p>
++    <ul>
++      #set ($unknownFields = [])
++      #foreach ($field in $doc.getxWikiClass().properties)
++        #set ($formFieldDoc = $propertyType2FormField.get($field.classType))
++        #if ($formFieldDoc)
++          <li>#displayField($field $formFieldDoc)</li>
++        #else
++          #set($discard = $unknownFields.add($field))
++        #end
        #end
--    #end
--    #if(!$empty)
--      ## Leave an empty line to separate the blocks.
--
--    #end
--    ##
--    (% class="hidden" %)
--    {{html}}
++    </ul>
++    <div class="hidden">
        ## Output the field meta data even if the field is not supported to preserve it when the class is saved.
--      #foreach($field in $unknownFields)
++      #foreach ($field in $unknownFields)
          #displayFieldMetaData($field)
        #end
--    {{/html}}
--  )))
++    </div>
++  </div>
  #end
  #**
   * Display the options to create/update the class template, the class sheet and the class translation bundle.
   *#
--#macro(displayClassOptions)
++#macro (displayClassOptions)
    #set ($className = $stringtool.removeEnd($doc.fullName, 'Class'))
    #set ($templateReference = $services.model.resolveDocument("${className}Template"))
    #set ($translationsReference = $services.model.resolveDocument("${className}Translations"))
@@ -155,7 +155,6 @@
    #elseif ($classSheets.size() == 1)
      #set ($sheetReference = $classSheets.get(0))
    #end
--  {{html}}
    ## Hide the options if neither the sheet nor the template nor the translation bundle exists. They don't have to be
    ## updated, they have to be created.
    <dl id="options" #if (!$xwiki.exists($sheetReference) && !$xwiki.exists($templateReference)
@@ -204,7 +204,6 @@
        </span>
      </dd>
    </dl>
--  {{/html}}
  #end
  #macro (pageLink $reference)
@@ -216,25 +216,21 @@
      #set ($action = 'create')
      #set ($discard = $params.put('parent', $doc.fullName))
    #end
--  <span class="$class">##
--    <a href="$escapetool.xml($xwiki.getURL($reference, $action, $escapetool.url($params)))">##
--      $escapetool.xml($reference.name)##
--    </a>##
--  </span>##
++  <span class="$class"><a href="$escapetool.xml($xwiki.getURL($reference, $action, $escapetool.url($params)))"
++    >$escapetool.xml($reference.name)</a></span>##
  #end
  #**
   * Display a form field.
   *#
--#macro(displayField $field $formFieldDoc)
--  #if($formFieldDoc.getObject('XWiki.StyleSheetExtension'))
--    #set($discard = $xwiki.ssx.use($formFieldDoc.fullName))
++#macro (displayField $field $formFieldDoc)
++  #if ($formFieldDoc.getObject('XWiki.StyleSheetExtension'))
++    #set ($discard = $xwiki.ssx.use($formFieldDoc.fullName))
    #end
--  #if($formFieldDoc.getObject('XWiki.JavaScriptExtension'))
--    #set($discard = $xwiki.jsx.use($formFieldDoc.fullName))
++  #if ($formFieldDoc.getObject('XWiki.JavaScriptExtension'))
++    #set ($discard = $xwiki.jsx.use($formFieldDoc.fullName))
    #end
--  (% class="hidden" %)
--  {{html}}
++  <div class="hidden">
      #displayFieldMetaData($field)
      ## We need this information to avoid querying and loading all FormField documents twice.
      ## NOTE: We use a different ID format to avoid collisions with the field meta properties.
@@ -241,35 +241,35 @@
      <input type="hidden" id="template-$field.name" name="template-$field.name"
        value="$escapetool.xml($formFieldDoc.fullName)"
        data-propertyName="$escapetool.xml($formFieldDoc.getxWikiClass().propertyNames[0])" />
--  {{/html}}
--
--  #set($className = $stringtool.removeEnd($doc.fullName, 'Class'))
--  #set($templateRef = $services.model.resolveDocument("${className}Template"))
--  #set($templateDoc = $xwiki.getDocument($templateRef))
++  </div>
++  #set ($className = $stringtool.removeEnd($doc.fullName, 'Class'))
++  #set ($templateRef = $services.model.resolveDocument("${className}Template"))
++  #set ($templateDoc = $xwiki.getDocument($templateRef))
    ## Simulate the editing of the class instance from the template document.
    ## Note that we can't simply call display on the template document because $field could be a new field that hasn't
    ## been added to the class yet (so the object from the template doesn't have this field yet).
--  (% class="field-viewer" %)
--  #displayFieldProperty($field "${doc.fullName}_0_" $templateDoc.getObject($doc.fullName, true))
--
--  #set($propertyNames = ['name', 'prettyName', 'number', 'required', 'hint'])
--  #set($formFieldObj = $formFieldDoc.getObject('AppWithinMinutes.FormFieldClass'))
--  #set($customPropertyNames = $formFieldObj.getProperty('properties').value.split('\s+'))
--  #set($discard = $customPropertyNames.removeAll($propertyNames))
--  #set($discard = $propertyNames.addAll($customPropertyNames.subList(0, $customPropertyNames.size())))
--  (% class="field-config" %)
--  #foreach($propertyName in $propertyNames)
--    #set($propertyDefinition = $field.xWikiClass.get($propertyName))
--    #if($propertyDefinition)
--      #displayFieldProperty($propertyDefinition "field-${field.name}_" $field)
++  <dl class="field-viewer">
++    #displayFieldProperty($field "${doc.fullName}_0_" $templateDoc.getObject($doc.fullName, true))
++  </dl>
++  #set ($propertyNames = ['name', 'prettyName', 'number', 'required', 'hint'])
++  #set ($formFieldObj = $formFieldDoc.getObject('AppWithinMinutes.FormFieldClass'))
++  #set ($customPropertyNames = $formFieldObj.getProperty('properties').value.split('\s+'))
++  #set ($discard = $customPropertyNames.removeAll($propertyNames))
++  #set ($discard = $propertyNames.addAll($customPropertyNames.subList(0, $customPropertyNames.size())))
++  <dl class="field-config">
++    #foreach ($propertyName in $propertyNames)
++      #set ($propertyDefinition = $field.xWikiClass.get($propertyName))
++      #if ($propertyDefinition)
++        #displayFieldProperty($propertyDefinition "field-${field.name}_" $field)
++      #end
      #end
--  #end
++  </dl>
  #end
  #**
   * Display the field meta data. This is needed to preserve the field when its type is not supported by the editor.
   *#
--#macro(displayFieldMetaData $field)
++#macro (displayFieldMetaData $field)
    <input type="hidden" id="type-$field.name" name="type-$field.name" value="$field.classType" />
  #end
@@ -276,13 +276,18 @@
  #**
   * Displays a configuration property of a class field. This macro can also be used to display a property of an object.
   *#
--#macro(displayFieldProperty $property $prefix $field)
--  #set($displayFormType = $property.getProperty('displayFormType'))
--  #if($property.classType == 'Boolean' && (!$displayFormType || $displayFormType.value == 'checkbox'))
--    ; {{html clean="false"}}<label for="$!{prefix}$property.name">#displayPropertyEditInput($property, $prefix, $field)$escapetool.xml($property.prettyName)</label>{{/html}}
++#macro (displayFieldProperty $property $prefix $field)
++  #set ($displayFormType = $property.getProperty('displayFormType'))
++  #if ($property.classType == 'Boolean' && (!$displayFormType || $displayFormType.value == 'checkbox'))
++    <dt>
++      <label for="$!{prefix}$property.name">
++        #displayPropertyEditInput($property, $prefix, $field)$escapetool.xml($property.prettyName)
++      </label>
++    </dt>
++    <dd></dd>
    #else
--    ; {{html}}<label for="${prefix}$property.name">$escapetool.xml($property.prettyName)</label>{{/html}}
--    : {{html clean="false"}}#displayPropertyEditInput($property, $prefix, $field){{/html}}
++    <dt><label for="${prefix}$property.name">$escapetool.xml($property.prettyName)</label></dt>
++    <dd>#displayPropertyEditInput($property, $prefix, $field)</dd>
    #end
  #end
@@ -289,12 +289,18 @@
  #**
   * Displays the input used to edit the specified property of the given object. The given object can be either an
   * instance of an XWiki class or a class field. In the first case the property represents an object field and in the
-- * second case the property represents a field meta property.
++ * second case the property represents a field meta property. We currently don't use custom display for metaproperty,
++ * so in that case we fallback on displayEdit.
   *#
--#macro(displayPropertyEditInput $property $prefix $object)
--  #set($wrappedProperty = $property.propertyClass)
--  #if($wrappedProperty.isCustomDisplayed($xcontext.context))
--    $xcontext.get('propertyCustomDisplayer').display($property, $prefix, $object)
++#macro (displayPropertyEditInput $property $prefix $object)
++  #set ($wrappedProperty = $property.propertyClass)
++  #if ($wrappedProperty.isCustomDisplayed($xcontext.context))
++    #set ($customDisplayer = $!xcontext.get('propertyCustomDisplayer').display($property, $prefix, $object))
++    #if ((! $customDisplayer) && ("$!customDisplayer" == ""))
++      $doc.displayEdit($property, $prefix, $object)
++    #else
++      $customDisplayer
++    #end
    #else
      $doc.displayEdit($property, $prefix, $object)
    #end
@@ -303,26 +303,23 @@
  #**
   * Called when a new form field is added via AJAX.
   *#
--#macro(displayNewField)
++#macro (displayNewField)
    ## Output the SkinExtension hooks to allow field displayers to pull JavaScript/CSS resources.
    ## Output also the LinkExtension hook because $xwiki.linkx.use() is used to load CSS files from WebJars.
    ## The class editor moves this resource includes in the HTML page head.
--  {{html}}
    <!-- com.xpn.xwiki.plugin.skinx.LinkExtensionPlugin -->
    #skinExtensionHooks
--  {{/html}}
--
--  #set($formFieldDoc = $xwiki.getDocument($request.field))
--  #set($formFieldDocClassFields = $formFieldDoc.getxWikiClass().getXWikiClass().properties)
--  #if($formFieldDocClassFields.size() > 0)
++  #set ($formFieldDoc = $xwiki.getDocument($request.field))
++  #set ($formFieldDocClassFields = $formFieldDoc.getxWikiClass().getXWikiClass().properties)
++  #if ($formFieldDocClassFields.size() > 0)
      ## Clone the field template.
--    #set($field = $formFieldDocClassFields.get(0).clone())
--    #if("$!field.prettyName" == '')
--      #set($discard = $field.setPrettyName($formFieldDoc.title))
++    #set ($field = $formFieldDocClassFields.get(0).clone())
++    #if ("$!field.prettyName" == '')
++      #set ($discard = $field.setPrettyName($formFieldDoc.title))
      #end
--    #set($xclass = $doc.getxWikiClass().getXWikiClass())
--    #set($discard = $xclass.addField($field.name, $field))
--    #set($discard = $field.setObject($xclass))
++    #set ($xclass = $doc.getxWikiClass().getXWikiClass())
++    #set ($discard = $xclass.addField($field.name, $field))
++    #set ($discard = $field.setObject($xclass))
      #displayField($doc.getxWikiClass().get($field.name) $formFieldDoc)
    #else
      Unsupported form field.
@@ -332,87 +332,91 @@
  #**
   * Preview a class field (requires Programming Right).
   *#
--#macro(previewField)
++#macro (previewField)
    ## Find the request parameter that specifies the field template.
--  #foreach($paramName in $request.getParameterMap().keySet())
--    #if($paramName.startsWith('template-'))
--      #set($fieldName = $paramName.substring(9))
--      #set($fieldTemplateDoc = $xwiki.getDocument($request.getParameter($paramName)))
++  #foreach ($paramName in $request.getParameterMap().keySet())
++    #if ($paramName.startsWith('template-'))
++      #set ($fieldName = $paramName.substring(9))
++      #set ($fieldTemplateDoc = $xwiki.getDocument($request.getParameter($paramName)))
        #break
      #end
    #end
    ##
    ## Clone the field template.
--  #set($field = $fieldTemplateDoc.getxWikiClass().getXWikiClass().properties.get(0).clone())
++  #set ($field = $fieldTemplateDoc.getxWikiClass().getXWikiClass().properties.get(0).clone())
    ##
    ## Update the field meta properties based on the submitted data.
--  #set($valuesFromRequest = $xcontext.context.getForm().getObject("field-$fieldName"))
--  #set($discard = $field.getxWikiClass().fromMap($valuesFromRequest, $field))
++  #set ($valuesFromRequest = $xcontext.context.getForm().getObject("field-$fieldName"))
++  #set ($discard = $field.getxWikiClass().fromMap($valuesFromRequest, $field))
    ##
    ## Don't rename the field (ignore the submitted name).
--  #set($discard = $field.setName($fieldName))
++  #set ($discard = $field.setName($fieldName))
    ##
    ## We have to add the field to the class before setting its value.
    ## (otherwise the field value from the request is ignored).
--  #set($xclass = $doc.getxWikiClass().getXWikiClass())
--  #set($discard = $xclass.addField($fieldName, $field))
--  #set($discard = $field.setObject($xclass))
++  #set ($xclass = $doc.getxWikiClass().getXWikiClass())
++  #set ($discard = $xclass.addField($fieldName, $field))
++  #set ($discard = $field.setObject($xclass))
    ##
    ## Create an object that has this field and set its value from request.
--  #set($object = $fieldTemplateDoc.getObject($doc.fullName, true))
++  #set ($object = $fieldTemplateDoc.getObject($doc.fullName, true))
    ##
    ## Filter empty values from the request, otherwise the update method could try to select an invalid value.
--  #set($values = [])
--  #foreach($value in $request.getParameterValues("${doc.fullName}_0_$fieldName"))
--    #if($value != '')
--      #set($discard = $values.add($value))
++  #set ($values = [])
++  #foreach ($value in $request.getParameterValues("${doc.fullName}_0_$fieldName"))
++    #if ($value != '')
++      #set ($discard = $values.add($value))
      #end
    #end
--  #if($values.size() > 0)
--    #set($stringArray = $request.getParameterValues("template-$fieldName"))
--    #set($discard = $xclass.fromMap({$fieldName: $values.toArray($stringArray)}, $object.getXWikiObject()))
++  #if ($values.size() > 0)
++    #set ($stringArray = $request.getParameterValues("template-$fieldName"))
++    #set ($discard = $xclass.fromMap({$fieldName: $values.toArray($stringArray)}, $object.getXWikiObject()))
    #end
    ##
    ## Display the field.
--  #set($field = $doc.getxWikiClass().get($fieldName))
--  {{html clean="false"}}#displayPropertyEditInput($field, "${doc.fullName}_0_", $object){{/html}}
++  #set ($field = $doc.getxWikiClass().get($fieldName))
++  #displayPropertyEditInput($field, "${doc.fullName}_0_", $object)
  #end
  #**
   * Display the edit class form.
   *#
--#macro(displayEditForm)
--  $xwiki.jsfx.use('js/scriptaculous/dragdrop.js')##
--  $xwiki.jsx.use('AppWithinMinutes.ClassEditSheet')##
--  $xwiki.ssx.use('AppWithinMinutes.ClassEditSheet')##
--  $xwiki.ssx.use('AppWithinMinutes.ClassSheetGenerator')##
--  #if("$!request.wizard" == 'true')
++#macro (displayEditForm)
++  #set ($discard = $xwiki.jsfx.use('js/scriptaculous/dragdrop.js'))
++  #set ($discard = $xwiki.jsx.use('AppWithinMinutes.ClassEditSheet'))
++  #set ($discard = $xwiki.ssx.use('AppWithinMinutes.ClassEditSheet'))
++  #set ($discard = $xwiki.ssx.use('AppWithinMinutes.ClassSheetGenerator'))
++  #if ("$!request.wizard" == 'true')
      #appWizardHeader('structure')
--
    #end
    #displayFieldPalette()
    #displayFieldCanvas()
    #displayClassOptions()
    #if("$!request.wizard" == 'true')
--
      #appWizardFooter('structure')
    #end
--  (% class="clearfloats" %)((()))
++  <div class="clearfloats"></div>
  #end
  #**
   * Displays either the edit class form or a new form field. The later is used when adding a new form field via AJAX.
   *#
--#macro(doEdit)
--  #if("$!request.field" != '')
++#macro (doEdit)
++  #if ("$!request.field" != '')
      #displayNewField()
--  #elseif("$!request.preview" == 'true')
++  #elseif ("$!request.preview" == 'true')
      #previewField()
    #else
      ## Make sure that only the sheet content is rendered when the class is saved using AJAX.
--    (% class="hidden" %)
--    {{html}}<input type="hidden" name="xpage" value="plain" />{{/html}}
--
++    <div class="hidden">
++      <input type="hidden" name="xpage" value="plain" />
++      #if ($request.wizard == 'true')
++        ## Preserve the wizard mode.
++        <input type="hidden" name="wizard" value="true" />
++      #end
++      ## Compute the application title to be used as the wizard step title.
++      #getAppTitle
++    </div>
      #displayEditForm()
    #end
  #end
@@ -428,10 +428,7 @@
      #try()
        #set ($discard = $copyAsJob.join())
        #set ($copyAsJobStatus = $services.job.getJobStatus($copyAsJob.request.id))
--      #set ($errorLogs = $copyAsJobStatus.log.getLogs('ERROR'))
--      #if ($errorLogs.size() > 0)
--        #set ($errorMessage = $errorLogs.get(0).toString())
--      #end
++      #set ($errorMessage = $copyAsJobStatus.logTail.getFirstLogEvents('ERROR').toString())
      #end
    #end
  #end
@@ -570,7 +570,7 @@
      #set($className = $stringtool.removeEnd($doc.fullName, 'Class'))
      #set($templateRef = $services.model.resolveDocument("${className}Template"))
      #set($templateDoc = $xwiki.getDocument($templateRef))
--    #set($discard = $templateDoc.setParent($doc.name))
++    #set($discard = $templateDoc.setParent($doc.documentReference.name))
      #if ($request.templateTitle)
        #set($discard = $templateDoc.setTitle($request.templateTitle))
      #end
@@ -608,7 +608,7 @@
      #if($sheetReference)
        #set($sheetDoc = $xwiki.getDocument($sheetReference))
        #set($sheetGeneratorDoc = $xwiki.getDocument('AppWithinMinutes.ClassSheetGenerator'))
--      #set($discard = $sheetDoc.setParent($doc.name))
++      #set($discard = $sheetDoc.setParent($doc.documentReference.name))
        #set($discard = $sheetDoc.setContent($doc.getRenderedContent($sheetGeneratorDoc.content,
          $sheetGeneratorDoc.syntax.toIdString(), 'plain/1.0')))
        #set($discard = $sheetDoc.setHidden(true))
@@ -632,7 +632,7 @@
        #set ($scope = 'WIKI')
      #end
      #set($discard = $translationsObj.set('scope', $scope))
--    #set($discard = $translationsDoc.setParent($doc.name))
++    #set($discard = $translationsDoc.setParent($doc.documentReference.name))
      #set($translationsGeneratorDoc = $xwiki.getDocument('AppWithinMinutes.ClassTranslationsGenerator'))
      #set($discard = $translationsDoc.setContent($doc.getRenderedContent($translationsGeneratorDoc.content,
        $translationsGeneratorDoc.syntax.toIdString(), 'plain/1.0')))
@@ -646,17 +646,17 @@
  #**
   * Updates and saves the class definition, the class sheet and the class template.
   *#
--#macro(doSave)
--  #set($minorEdit = "$!request.minorEdit" != '')
++#macro (doSave)
++  #set ($minorEdit = "$!request.minorEdit" != '')
    #maybeCreateCodeSpace
    #updateAndSaveClass
    #updateAndSaveTemplate
    #updateAndSaveSheet
    #updateAndSaveTranslations
--  #if($action == 'save')
--    #if($errorMessage)
--      {{error}}{{html}}$errorMessage{{/html}}{{/error}}
--    #elseif("$!request.wizard" == 'true')
++  #if ($action == 'save')
++    #if ($errorMessage)
++      <div class="box errormessage">$errorMessage</div>
++    #elseif ("$!request.wizard" == 'true')
        ## Redirect to next wizard step.
        #set ($className = $stringtool.removeEnd($doc.fullName, 'Class'))
        #set ($templateProviderReference = $services.model.resolveDocument("${className}TemplateProvider"))
@@ -676,7 +676,7 @@
        $response.sendRedirect($doc.getURL())
      #end
    #else
--    #if($errorMessage)
++    #if ($errorMessage)
        $response.sendError(400, $errorMessage)
      #else
        $response.setStatus(204)
@@ -692,21 +692,23 @@
  {{/velocity}}
  {{velocity}}
++{{html clean="false"}}
  ## Determine the action button that triggered the request
--#set($action = 'edit')
--#foreach($paramName in $request.getParameterMap().keySet())
--  #if($paramName.startsWith('xaction_'))
--    #set($action = $paramName.substring(8))
++#set ($action = 'edit')
++#foreach ($paramName in $request.getParameterMap().keySet())
++  #if ($paramName.startsWith('xaction_'))
++    #set ($action = $paramName.substring(8))
      #break
    #end
  #end
--#if($action == 'edit')
++#if ($action == 'edit')
    #doEdit()
--#elseif($action == 'save' || $action == 'saveandcontinue')
--  #if($services.csrf.isTokenValid($request.form_token))
++#elseif ($action == 'save' || $action == 'saveandcontinue')
++  #if ($services.csrf.isTokenValid($request.form_token))
      #doSave()
    #else
--    $response.sendRedirect($services.csrf.getResubmissionURL());
++    $response.sendRedirect($services.csrf.getResubmissionURL())
    #end
  #end
++{{/html}}
  {{/velocity}}

XWiki.JavaScriptExtension[2]

Code

@@ -520,10 +520,10 @@
      if (!form) {
        return false;
      }
--    // Let the sheet handle the form submit.
--    // NOTE: The code that handles Save&Continue uses this URL to make the AJAX request and Firefox 3.6 doesn't resolve
--    // the empty string to the current page URL so we have to explicitly specify it.
--    form.action = window.location.href;
++    // Let the sheet handle the form submit. The form is submitted by default to the preview action which dispatches the
++    // request to the save action if the save button is detected on the request parameters. By submitting to the edit
++    // action the edit sheet is evaluated and thus it can handle the save by itself.
++    form.action = XWiki.currentDocument.getURL('edit');
      // Apply the vertical form layout standard.
      form.addClassName('xform');