Modifications pour le document LiveTableEditSheet

Modifié par superadmin le 2021/12/12 21:57

Depuis la version < 2.1 >

modifié par Paul Libbrecht (admin)
sur 2016/07/26 22:02

À la version 1.1 >

modifié par Administrator
sur 2013/06/04 10:06

Commentaire de modification : Import

Source
Rendu

Résumé

Propriétés de la Page (2 modifications, 0 ajouts, 0 suppressions)
Objets (2 modifications, 0 ajouts, 0 suppressions)
- XWiki.JavaScriptExtension[0]
- XWiki.StyleSheetExtension[0]

Détails

Propriétés de la Page

Auteur du document

@@ -1,1 +1,1 @@
--XWiki.adminPolx
++XWiki.Admin

Contenu

@@ -2,8 +2,9 @@
  #macro(listAvailableColumns)
    {{html}}
    <select id="availableColumns">
--    #set($className = "$!liveTableObj.getValue('class')")
++    #set($className = "$!liveTableObj.getProperty('class').value")
      #set($classFields = $xwiki.getDocument($className).getxWikiClass().properties)
++    #set($discard = $services.localization.use('document', "$stringtool.removeEnd($className, 'Class')Translations"))
      #if($classFields.size() > 0)
        <optgroup label="$escapetool.xml($services.localization.render('platform.appwithinminutes.liveTableEditorClassFieldColumnGroupLabel'))" id="classFields">
          #foreach($field in $classFields)
@@ -49,9 +49,8 @@
    (((
      ## Make sure that only the sheet content is rendered when the class is saved using AJAX.
      <input type="hidden" name="xpage" value="plain" />
--    ## We prevent the class name and the data space from being edited directly. They can be specified in the URL.
++    ## We prevent the class name from being edited directly. The class name can be specified in the URL.
      $doc.display('class', 'hidden')
--    $doc.display('class', 'dataSpace')
      ## We have to pass the list of available columns to the JavaScript code.
      #listAvailableColumns()
    )))
@@ -68,18 +68,18 @@
    #if($services.uix)
      #set($icon = 'icon:application')
      #foreach($uix in $services.uix.getExtensions('org.xwiki.platform.panels.Applications'))
--      #if($uix.getId() == "platform.panels.${doc.space}Application" && "$!uix.getParameters().get('icon')" != '')
--        #set($icon = $uix.getParameters().get('icon'))
++      #if($uix.getId() == "platform.panels.${doc.space}Application")
++        #if("$!uix.getParameters().get('icon')" != '')
++          #set($icon = $uix.getParameters().get('icon'))
++        #end
        #end
      #end
      {{html wiki="true"}}
--    ; <label for="applicationIcon">$services.localization.render('platform.appwithinminutes.liveTableEditorIcon')</label>
--      (% class="xHint" %)$services.localization.render('platform.appwithinminutes.liveTableEditorIconHintWithPicker',
--        [$xwiki.getSkinFile('icons/silk/index_abc.png')])
--    : <input id="applicationIcon" name="applicationIcon" type="text" size="10" value="$!escapetool.xml($icon)" />
--    {{/html}}
--
--    {{iconPicker id="applicationIcon" prefix="icon:" /}}
++      ## The icon
++      ; <label for="applicationIcon">$services.localization.render('platform.appwithinminutes.liveTableEditorIcon')</label>
++        (% class="xHint" %)$services.localization.render('platform.appwithinminutes.liveTableEditorIconHint', $xwiki.getSkinFile('icons/silk/index_abc.png'))
++      : <input id="applicationIcon" name="applicationIcon" type="text" size="10" value="$!icon" />
++      {{/html}}
    #end
  #end
@@ -108,93 +108,54 @@
    {{html}}<div class="clearfloats"></div>{{/html}}
  #end
--#macro (maybeGrantSpaceAdminRight $spaceRef)
--  ## Grant space administration rights only if the space is new. Don't overwrite existing space preferences.
--  #set ($spaceHomeRef = $services.model.resolveDocument('', 'default', $spaceRef))
--  #set ($spacePrefsRef = $services.model.resolveDocument('WebPreferences', 'explicit', $spaceRef))
--  #if (!$xwiki.exists($spaceHomeRef) && !$xwiki.exists($spacePrefsRef))
--    #set ($spacePrefsDoc = $xwiki.getDocument($spacePrefsRef))
--    #set ($discard = $spacePrefsDoc.use($spacePrefsDoc.getObject('XWiki.XWikiGlobalRights', true)))
--    #set ($discard = $spacePrefsDoc.set('allow', 1))
--    #set ($discard = $spacePrefsDoc.set('levels', 'admin'))
--    #set ($discard = $spacePrefsDoc.set('users', $services.model.serialize($xcontext.userReference, 'default')))
--    #set ($discard = $spacePrefsDoc.setTitle('$services.localization.render(''admin.preferences.title'')'))
--    #set ($discard = $spacePrefsDoc.setParent($services.model.serialize($spaceHomeRef, 'default')))
--    #set ($discard = $spacePrefsDoc.setHidden(true))
--    #set ($discard = $spacePrefsDoc.saveWithProgrammingRights($services.localization.render(
--      'platform.appwithinminutes.grantSpaceAdminRightsSaveComment')))
++#macro(maybeGrantSpaceAdminRights)
++  #set($spaceHomeRef = $services.model.createDocumentReference($doc.wiki, $doc.space, 'WebHome'))
++  ## Grant space administration rights only if the space is new.
++  #if(!$xwiki.exists($spaceHomeRef))
++    #set($spacePrefsRef = $services.model.createDocumentReference($doc.wiki, $doc.space, 'WebPreferences'))
++    #set($spacePrefsDoc = $xwiki.getDocument($spacePrefsRef))
++    ## Don't overwrite existing space preferences.
++    #if($spacePrefsDoc.isNew())
++      #set($discard = $spacePrefsDoc.use($spacePrefsDoc.getObject('XWiki.XWikiGlobalRights', true)))
++      #set($discard = $spacePrefsDoc.set('allow', 1))
++      #set($discard = $spacePrefsDoc.set('levels', 'admin'))
++      #set($discard = $spacePrefsDoc.set('users', $services.model.serialize($xcontext.userReference, 'default')))
++      #set($discard = $spacePrefsDoc.setParent($services.model.serialize($spaceHomeRef, 'default')))
++      #set($discard = $spacePrefsDoc.setHidden(true))
++      #set($discard = $spacePrefsDoc.saveWithProgrammingRights($services.localization.render('platform.appwithinminutes.grantSpaceAdminRightsSaveComment')))
++    #end
    #end
  #end
--#macro (maybeGrantSpaceAdminRights)
--  ## Application space
--  #set ($appReference = $doc.documentReference.parent)
--  #maybeGrantSpaceAdminRight($appReference)
--  ## Code space (if it's not nested inside the application space)
--  #set ($className = $request.get('AppWithinMinutes.LiveTableClass_0_class'))
--  #set ($classReference = $services.model.resolveDocument($className))
--  #if (!$classReference.hasParent($appReference))
--    #maybeGrantSpaceAdminRight($classReference.parent)
--  #end
--#end
--
  #macro(updateAndSaveLiveTable)
    #set($discard = $doc.updateObjectFromRequest('AppWithinMinutes.LiveTableClass'))
    #set($liveTableGeneratorDoc = $xwiki.getDocument('AppWithinMinutes.LiveTableGenerator'))
--
--  ## Generate the LiveTable by displaying the LiveTableGenerator document in the context of the current document.
--  #set ($displayParameters = $services.display.createDocumentDisplayerParameters())
--  #set ($discard = $displayParameters.setExecutionContextIsolated(false))
--  #set ($discard = $displayParameters.setContentTranslated(true))
--  #set ($generatedLiveTableContent = $services.display.content($liveTableGeneratorDoc, { 'outputSyntaxId' : 'plain/1.0', 'displayerParameters' : $displayParameters }))
--
--  ## Use the generated LiveTable content for the data home page.
--  #set ($dataSpaceReference = $services.model.resolveSpace($doc.getValue('dataSpace')))
--  #set ($dataSpaceHomeReference = $services.model.resolveDocument('', 'default', $dataSpaceReference))
--  #if ($dataSpaceHomeReference.equals($doc.documentReference))
--    ## The application space and the data space are one and the same.
--    #set ($dataHomePage = $doc)
--  #else
--    ## The application data is stored in a different space.
--    #set ($dataHomePage = $xwiki.getDocument($dataSpaceHomeReference))
--    #set ($discard = $dataHomePage.setHidden(true))
--    #set ($escapedAppName = $doc.documentReference.parent.name.toLowerCase().replace("'", "''"))
--    #set ($discard = $dataHomePage.setTitle("${escapetool.d}services.localization.render('${escapedAppName}.dataSpace.title')"))
--
--    ## Update the home page content.
--    #set ($homePageContent = '')
--    #if ("$!generatedLiveTableContent" != '')
--      ## Include the entries live table in the application home page.
--      #set ($escapedReference = $services.model.serialize($dataSpaceHomeReference).replaceAll('([~"])', '~$1'))
--      #set ($homePageContent = "{{include reference=""$escapedReference"" /}}")
--    #end
--    #set ($discard = $doc.setContent($homePageContent))
--  #end
--  #set ($discard = $dataHomePage.setContent($generatedLiveTableContent))
--
++  #set($discard = $doc.setContent($doc.getRenderedContent($liveTableGeneratorDoc.content, $liveTableGeneratorDoc.syntax.toIdString(), 'plain/1.0')))
    #set($minorEdit = "$!request.minorEdit" != '')
    #set($comment = $request.comment)
    #if("$!comment" == '')
      #set($comment = $services.localization.render('platform.appwithinminutes.liveTableEditorSaveComment'))
    #end
++  #set($discard = $doc.save($comment, $minorEdit))
++#end
--  #if ($dataHomePage != $doc)
--    ## Save the data home page.
--    #set ($discard = $dataHomePage.save($comment, $minorEdit))
++#macro(maybeCreateLiveTableResultsPage)
++  #set ($className = "$!doc.getObject('AppWithinMinutes.LiveTableClass').getProperty('class').value")
++  #set ($liveTableResultsDoc = $xwiki.getDocument("$!stringtool.removeEnd($className, 'Class')LiveTableResults"))
++  #set ($liveTableResultsGeneratorDoc = $xwiki.getDocument('AppWithinMinutes.LiveTableResultsGenerator'))
++  #if ($liveTableResultsDoc.isNew())
++    #set ($discard = $liveTableResultsDoc.setParent($doc.name))
++    #set ($discard = $liveTableResultsDoc.setHidden(true))
++    #set ($discard = $liveTableResultsDoc.setContent($doc.getRenderedContent($liveTableResultsGeneratorDoc.content, $liveTableResultsGeneratorDoc.syntax.toIdString(), 'plain/1.0')))
++    #set ($discard = $liveTableResultsDoc.save($services.localization.render('platform.appwithinminutes.liveTableEditorCreateLiveTableResultsComment')))
    #end
--
--  ## Save the application home page.
--  #set($discard = $doc.save($comment, $minorEdit))
  #end
  #macro(updateAndSaveIcon)
    #set($uix = $doc.getObject('XWiki.UIExtensionClass', true))
--  #set($appName = $doc.documentReference.parent.name)
--  #set($discard = $uix.set('name', "platform.panels.${appName}Application"))
--  #set($discard = $uix.set('extensionPointId', 'org.xwiki.platform.panels.Applications'))
--  #set($discard = $uix.set('parameters', "label=${appName}${util.newline}target=${doc.fullName}${util.newline}icon=${request.applicationIcon}"))
--  #set ($hasWikiAdminRights = $services.security.authorization.hasAccess('admin', $doc.documentReference.wikiReference))
--  #set($discard = $uix.set('scope', "#if ($hasWikiAdminRights)wiki#{else}user#end"))
++  #set($discard = $uix.set('name', "platform.panels.${doc.space}Application"))
++  #set($discard = $uix.set('extensionPointId', "org.xwiki.platform.panels.Applications"))
++  #set($discard = $uix.set('parameters', "label=${doc.space}${util.newline}target=${doc.fullName}${util.newline}icon=${request.applicationIcon}"))
    #set($discard = $doc.save('Updated application icon', true))
  #end
@@ -201,6 +201,7 @@
  #macro(doSave)
    #maybeGrantSpaceAdminRights()
    #updateAndSaveLiveTable()
++  #maybeCreateLiveTableResultsPage()
    #updateAndSaveIcon()
    #if($action == 'save')
      #if($errorMessage)
@@ -221,13 +221,13 @@
  {{velocity}}
  #if("$!request.wizard" == 'true')
--  {{include reference="AppWithinMinutes.WizardStep" /}}
++  {{include document="AppWithinMinutes.WizardStep" /}}
  #end
  {{/velocity}}
  {{velocity}}
  ## Determine the action button that triggered the request
--#set($action = $xcontext.action)
++#set($action = $context.action)
  #foreach($paramName in $request.getParameterMap().keySet())
    #if($paramName.startsWith('xaction_'))
      #set($action = $paramName.substring(8))

XWiki.JavaScriptExtension[0]

Code

@@ -135,7 +135,7 @@
    form.addClassName('xform');
    // Remove the preview button.
--  form.down("input[name='action_preview']").remove();
++  form.down("input[name='action_preview']").up().remove();
    // Rename the save buttons.
    form.down("input[name='action_save']").name = 'xaction_save';

XWiki.StyleSheetExtension[0]

Code

@@ -3,7 +3,6 @@
    font-size: 90%;
    list-style: none outside none;
    margin: 0;
--  padding: 0;
  }
  #inline .hList li {
@@ -53,8 +53,7 @@
  }
  .columnPicker input[type=image] {
--  margin: 0 .5em;
--  padding: 0;
++  margin-left: 2px;
    vertical-align: text-bottom;
  }

Modifications pour le document LiveTableEditSheet

Résumé

Détails

Accès Rapide

Applications

Mes dernières modifications