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/11.2]
Summary
-
Page properties (3 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,1 @@ 1 -#if( !$doc.name.endsWith('Sheet'))$services.localization.render('appWithinMinutes.templateProviderEditor.title', [$stringtool.removeEnd($doc.name, 'TemplateProvider')])#{else}$doc.name#end1 +#if ("$!appTitle" != '')$appTitle#else$doc.pageReference.name#end - Author
-
... ... @@ -1,1 +1,1 @@ 1 -xwiki:XWiki. superadmin1 +xwiki:XWiki.raj - Content
-
... ... @@ -1,7 +1,9 @@ 1 1 {{include reference="XWiki.TemplateProviderMacros" /}} 2 2 3 +{{include reference="AppWithinMinutes.VelocityMacros" /}} 4 + 3 3 {{velocity}} 4 -#if("$!request.wizard" == 'true') 6 +#if ("$!request.wizard" == 'true') 5 5 {{include reference="AppWithinMinutes.WizardStep" /}} 6 6 #end 7 7 {{/velocity}} ... ... @@ -9,12 +9,15 @@ 9 9 {{velocity output="false"}} 10 10 #set ($appDescriptorClassName = 'AppWithinMinutes.LiveTableClass') 11 11 12 -#macro ( initializeTemplateProvider)13 - #set ($prefix = $stringtool.removeEnd($doc.name, 'TemplateProvider')) 14 +#macro (updateHiddenTemplateProviderProperties) 15 + #set ($prefix = $stringtool.removeEnd($doc.documentReference.name, 'TemplateProvider')) 14 14 #set ($discard = $doc.setTitle("$prefix Template Provider")) 15 15 #set ($templateProviderObj = $doc.getObject('XWiki.TemplateProviderClass')) 16 16 #set ($discard = $templateProviderObj.set('name', "${prefix.toLowerCase()}.entry.name")) 17 17 #set ($discard = $templateProviderObj.set('template', $stringtool.removeEnd($doc.fullName, 'Provider'))) 20 +#end 21 + 22 +#macro (initVisibleTemplateProviderProperties $templateProviderObj) 18 18 #getAppReference 19 19 #set ($localStringAppRef = $services.model.serialize($appReference, 'local')) 20 20 #set ($icon = 'application') ... ... @@ -46,31 +46,6 @@ 46 46 #set ($discard = $templateProviderObj.set('creationRestrictionsAreSuggestions', $creationRestrictionsAreSuggestions)) 47 47 #end 48 48 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 - 74 74 #macro (maybeAddXRedirectToNextWizardStep) 75 75 #if ("$!request.wizard" == 'true') 76 76 ## Add redirect to next wizard step. ... ... @@ -94,11 +94,11 @@ 94 94 #end 95 95 96 96 #macro (displayEditForm) 97 - {{html clean="false"}} 98 98 #set ($discard = $xwiki.ssx.use('XWiki.TemplateProviderMacros')) 99 99 #set ($discard = $xwiki.jsx.use('XWiki.TemplateProviderMacros')) 79 + #updateHiddenTemplateProviderProperties 100 100 #if ($doc.isNew()) 101 - #initi alizeTemplateProvider81 + #initVisibleTemplateProviderProperties($templateProviderObj) 102 102 #end 103 103 <div class="hidden"> 104 104 <input type="hidden" name="title" value="$escapetool.xml($doc.title)" /> ... ... @@ -206,18 +206,16 @@ 206 206 </div> 207 207 #locationPickerModal 208 208 </div> 209 - {{/html}} 210 - 211 - {{iconPicker id="XWiki\\.TemplateProviderClass_0_icon" prefix="" /}} 212 212 #end 213 213 214 214 #macro (doEdit) 215 - #if("$!request.wizard" == 'true') 192 + #if ("$!request.wizard" == 'true') 216 216 #appWizardHeader('entries') 217 - 194 + ## Compute the application title to be used as the wizard step title. 195 + #getAppTitle 218 218 #end 219 219 #displayEditForm 220 - #if("$!request.wizard" == 'true') 198 + #if ("$!request.wizard" == 'true') 221 221 #appWizardFooter('entries') 222 222 #end 223 223 #end ... ... @@ -225,6 +225,10 @@ 225 225 226 226 {{velocity}} 227 227 #if ($doc.getObject('XWiki.TemplateProviderClass')) 206 + {{html clean="false"}} 228 228 #doEdit 208 + {{/html}} 209 + 210 + {{iconPicker id="XWiki\\.TemplateProviderClass_0_icon" prefix="" /}} 229 229 #end 230 230 {{/velocity}}