Changes for page Create Application

Summary

• Page properties (2 modified, 0 added, 0 removed)

Details

Page properties

Author

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

Content

...	...	@@ -22,26 +22,19 @@
22	22	{{/html}}
23	23	#end
24	24
25		-#macro(getAppDescriptor $appReference)
	25	+#macro(getAppDescriptor $appName)
26	26	#set($appDescriptorClassName = 'AppWithinMinutes.LiveTableClass')
27	27	#set($appDescriptorStatement = "from doc.object($appDescriptorClassName) as obj where doc.space = :space")
28		- #set($localSpaceReference = $services.model.serialize($appReference, 'local'))
29		- #set($appDescriptors = $services.query.xwql($appDescriptorStatement).bindValue('space', $localSpaceReference).execute())
	28	+ #set($appDescriptors = $services.query.xwql($appDescriptorStatement).bindValue('space', $appName).execute())
30	30	#if($appDescriptors.size() > 0)
31	31	#set($appDescriptor = $xwiki.getDocument($appDescriptors.get(0)))
32	32	#end
33	33	#end
34	34
35		-#macro (processStep)
	34	+#macro(processStep)
36	36	## Check if the application already exists.
37		- #if ($request.resolve == 'true')
38		- #set ($appReference = $services.model.resolveSpace($request.appName))
39		- #else
40		- #set ($appReference = $services.model.createSpaceReference($request.appName,
41		- $doc.documentReference.wikiReference))
42		- #end
43		- #set ($appName = $appReference.name)
44		- #getAppDescriptor($appReference)
	36	+ #set($appName = $request.appName)
	37	+ #getAppDescriptor($appName)
45	45	#if($appDescriptor)
46	46	## Edit an existing application. Use the configured class name.
47	47	#set($classStringRef = $appDescriptor.getObject($appDescriptorClassName).getProperty('class').value)
...	...	@@ -52,26 +52,21 @@
52	52	#set($className = "#toXMLName($appName)")
53	53	#set($classRef = $services.model.createDocumentReference($doc.wiki, "${className}Code", "${className}Class"))
54	54	#end
55		- #set($queryString = {'wizard': true})
	48	+ #set($queryString = 'wizard=true')
56	56	#if(!$xwiki.exists($classRef))
57		- #set($appHomeRef = $services.model.resolveDocument('', 'default', $appReference))
58		- #set($discard = $queryString.putAll({
59		- 'editor': 'inline',
60		- 'template': 'AppWithinMinutes.ClassTemplate',
61		- 'parent': $services.model.serialize($appHomeRef),
62		- 'title': "$appName Class",
63		- 'AppWithinMinutes.MetadataClass_0_dataSpaceName': $appName
64		- }))
	50	+ #set($classTitle = "$appName Class")
	51	+ #set($appHomeRef = $services.model.createDocumentReference($doc.wiki, $appName, 'WebHome'))
	52	+ #set($classParent = $services.model.serialize($appHomeRef))
	53	+ #set($queryString = "$queryString&editor=inline&template=AppWithinMinutes.ClassTemplate&parent=$escapetool.url($classParent)&title=$escapetool.url($classTitle)&AppWithinMinutes.MetadataClass_0_dataSpaceName=$escapetool.url($appName)")
65	65	#end
66		- $response.sendRedirect($xwiki.getURL($classRef, 'edit', $escapetool.url($queryString)))
	55	+ $response.sendRedirect($xwiki.getURL($classRef, 'edit', $queryString))
67	67	#end
68	68
69	69	#macro(validateAppName $appName)
70		- #set ($appReference = $services.model.createSpaceReference($appName,
71		- $doc.documentReference.wikiReference))
72		- #getAppDescriptor($appReference)
	59	+ #getAppDescriptor("$!appName")
73	73	#if($appDescriptor)
74	74	## Edit an existing application.
	62	+ #set($appHomeRef = $appDescriptor.documentReference)
75	75	#set($classStringRef = $appDescriptor.getObject($appDescriptorClassName).getProperty('class').value)
76	76	## The class string reference is relative to the document holding the application descriptor.
77	77	#set($appClassRef = $services.model.resolveDocument($classStringRef, 'explicit', $appDescriptor.documentReference))
...	...	@@ -81,9 +81,9 @@
81	81	#if($className == '')
82	82	(% class="xErrorMsg" %)$services.localization.render('platform.appwithinminutes.appNameInvalidClassNameError')
83	83	#end
	72	+ #set($appHomeRef = $services.model.createDocumentReference($doc.wiki, $appName, 'WebHome'))
84	84	#set($appClassRef = $services.model.createDocumentReference($doc.wiki, "$!{className}Code", "$!{className}Class"))
85	85	#end
86		- #set($appHomeRef = $services.model.resolveDocument('', 'default', $appReference))
87	87	#set($appHomeURL = $stringtool.removeEnd($xwiki.getDocument($appHomeRef).getExternalURL(), 'WebHome'))
88	88	; $services.localization.render('platform.appwithinminutes.appNamePreviewHomePageUrlLabel')
89	89	: {{{$!appHomeURL}}}