Changes for page TemplateProviderEditSheet
Last modified by Richard Johnson on 2019/03/30 13:46
edited by Richard Johnson
on 2019/03/30 13:46
on 2019/03/30 13:46
Change comment:
Install extension [org.xwiki.platform:xwiki-platform-appwithinminutes-ui/10.6.1]
Summary
-
Page properties (3 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,1 @@ 1 -#if "$!appTitle" !='')$appTitle#else$doc.pageReference.name#end1 +#if(!$doc.name.endsWith('Sheet'))$services.localization.render('appWithinMinutes.templateProviderEditor.title', [$stringtool.removeEnd($doc.name, 'TemplateProvider')])#{else}$doc.name#end - Author
-
... ... @@ -1,1 +1,1 @@ 1 -xwiki:XWiki.ra j1 +xwiki:XWiki.superadmin - Content
-
... ... @@ -1,9 +1,7 @@ 1 1 {{include reference="XWiki.TemplateProviderMacros" /}} 2 2 3 -{{include reference="AppWithinMinutes.VelocityMacros" /}} 4 - 5 5 {{velocity}} 6 -#if 4 +#if("$!request.wizard" == 'true') 7 7 {{include reference="AppWithinMinutes.WizardStep" /}} 8 8 #end 9 9 {{/velocity}} ... ... @@ -11,15 +11,12 @@ 11 11 {{velocity output="false"}} 12 12 #set ($appDescriptorClassName = 'AppWithinMinutes.LiveTableClass') 13 13 14 -#macro ( updateHiddenTemplateProviderProperties)15 - #set ($prefix = $stringtool.removeEnd($doc. documentReference.name, 'TemplateProvider'))12 +#macro (initializeTemplateProvider) 13 + #set ($prefix = $stringtool.removeEnd($doc.name, 'TemplateProvider')) 16 16 #set ($discard = $doc.setTitle("$prefix Template Provider")) 17 17 #set ($templateProviderObj = $doc.getObject('XWiki.TemplateProviderClass')) 18 18 #set ($discard = $templateProviderObj.set('name', "${prefix.toLowerCase()}.entry.name")) 19 19 #set ($discard = $templateProviderObj.set('template', $stringtool.removeEnd($doc.fullName, 'Provider'))) 20 -#end 21 - 22 -#macro (initVisibleTemplateProviderProperties $templateProviderObj) 23 23 #getAppReference 24 24 #set ($localStringAppRef = $services.model.serialize($appReference, 'local')) 25 25 #set ($icon = 'application') ... ... @@ -51,6 +51,31 @@ 51 51 #set ($discard = $templateProviderObj.set('creationRestrictionsAreSuggestions', $creationRestrictionsAreSuggestions)) 52 52 #end 53 53 49 +#macro (getAppReference) 50 + #set ($appLocalRef = $doc.getValue('dataSpaceName')) 51 + #if ("$!appLocalRef" != '') 52 + ## Between 6.3M2 (XWIKI-11249) and 7.3RC1 (XWIKI-12741). 53 + #set ($appReference = $services.model.resolveSpace($appLocalRef)) 54 + #else 55 + ## Possible locations: 56 + ## 1. same space (<6.2M1, XWIKI-8757) 57 + ## 2. sibling space (between 6.2M1 and 6.3M2) 58 + ## 3. grand parent space (7.3RC1+) 59 + #set ($appReferences = [ 60 + $doc.documentReference.parent, 61 + $services.model.createSpaceReference($stringtool.removeEnd($doc.name, 'TemplateProvider'), 62 + $doc.documentReference.parent.parent), 63 + $doc.documentReference.parent.parent 64 + ]) 65 + #foreach ($item in $appReferences) 66 + #set ($appReference = $item) 67 + #if ($xwiki.getDocument($appReference).getObject($appDescriptorClassName)) 68 + #break 69 + #end 70 + #end 71 + #end 72 +#end 73 + 54 54 #macro (maybeAddXRedirectToNextWizardStep) 55 55 #if ("$!request.wizard" == 'true') 56 56 ## Add redirect to next wizard step. ... ... @@ -74,11 +74,11 @@ 74 74 #end 75 75 76 76 #macro (displayEditForm) 97 + {{html clean="false"}} 77 77 #set ($discard = $xwiki.ssx.use('XWiki.TemplateProviderMacros')) 78 78 #set ($discard = $xwiki.jsx.use('XWiki.TemplateProviderMacros')) 79 - #updateHiddenTemplateProviderProperties 80 80 #if ($doc.isNew()) 81 - #init VisibleTemplateProviderProperties($templateProviderObj)101 + #initializeTemplateProvider 82 82 #end 83 83 <div class="hidden"> 84 84 <input type="hidden" name="title" value="$escapetool.xml($doc.title)" /> ... ... @@ -186,16 +186,18 @@ 186 186 </div> 187 187 #locationPickerModal 188 188 </div> 209 + {{/html}} 210 + 211 + {{iconPicker id="XWiki\\.TemplateProviderClass_0_icon" prefix="" /}} 189 189 #end 190 190 191 191 #macro (doEdit) 192 - #if 215 + #if("$!request.wizard" == 'true') 193 193 #appWizardHeader('entries') 194 - ## Compute the application title to be used as the wizard step title. 195 - #getAppTitle 217 + 196 196 #end 197 197 #displayEditForm 198 - #if 220 + #if("$!request.wizard" == 'true') 199 199 #appWizardFooter('entries') 200 200 #end 201 201 #end ... ... @@ -203,10 +203,6 @@ 203 203 204 204 {{velocity}} 205 205 #if ($doc.getObject('XWiki.TemplateProviderClass')) 206 - {{html clean="false"}} 207 207 #doEdit 208 - {{/html}} 209 - 210 - {{iconPicker id="XWiki\\.TemplateProviderClass_0_icon" prefix="" /}} 211 211 #end 212 212 {{/velocity}}