Änderungen von Dokument LinkNameStrategyHelper

Zusammenfassung

• Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)

Details

Seiteneigenschaften

Inhalt

...	...	@@ -1,7 +1,6 @@
1		-{{template name="hierarchy_macros.vm" /}}
	1	+{{template name="hierarchy_macros.vm"/}}
2	2
3	3	{{velocity output="false"}}
4		-
5	5	#macro (computeInfoFromReference $reference $result)
6	6	#set ($title = $reference.name)
7	7	#set ($options = {
...	...	@@ -40,34 +40,43 @@
40	40	#macro (handleSuggestionRequest)
41	41	#set ($isAdvanced = $services.user.properties.type == 'ADVANCED')
42	42	#set ($result = [])
43		- #if ($isAdvanced)
44		- #set ($requestedReference = $services.model.resolveDocument($request.input, 'default'))
45		- #set ($cleanRequestedReference = $services.modelvalidation.transformEntityReference($requestedReference))
	42	+ #set ($requestedReference = $services.model.resolveDocument($request.input, 'default'))
	43	+ #if ($xwiki.exists($requestedReference))
46	46	#set ($location = $NULL)
47		- #computeInfoFromReference($cleanRequestedReference $location)
	45	+ #computeInfoFromReference($requestedReference $location)
48	48	#set ($discard = $result.add({
49		- 'reference': $services.model.serialize($cleanRequestedReference, 'default'),
50		- 'type': 'fullyResolvedInput',
	47	+ 'reference': $services.model.serialize($requestedReference, 'default'),
	48	+ 'type': 'exactMatch',
	49	+ 'location': $location,
	50	+ 'title': $xwiki.getDocument($requestedReference).displayTitle
	51	+ }))
	52	+ #else
	53	+ #if ($isAdvanced)
	54	+ #set ($cleanRequestedReference = $services.modelvalidation.transformEntityReference($requestedReference))
	55	+ #set ($location = $NULL)
	56	+ #computeInfoFromReference($cleanRequestedReference $location)
	57	+ #set ($discard = $result.add({
	58	+ 'reference': $services.model.serialize($cleanRequestedReference, 'default'),
	59	+ 'type': 'fullyResolvedInput',
	60	+ 'location': $location
	61	+ }))
	62	+ #end
	63	+ #set ($parentReference = $services.model.resolveDocument($request.base))
	64	+ #set ($requestedName = $request.input)
	65	+ #set ($transformedName = $services.modelvalidation.transformName($requestedName))
	66	+ #set ($spaceReference = $services.model.createSpaceReference($transformedName, $parentReference.lastSpaceReference))
	67	+ #set ($documentReference = $services.model.createDocumentReference('WebHome', $spaceReference))
	68	+ #set ($location = $NULL)
	69	+ #computeInfoFromReference($documentReference $location)
	70	+ #set ($discard = $result.add({
	71	+ 'reference': $services.model.serialize($documentReference, 'default'),
	72	+ 'type': 'resolvedInSpace',
51	51	'location': $location
52	52	}))
53	53	#end
54		- #set ($parentReference = $services.model.resolveDocument($request.base))
55		- #set ($requestedName = $request.input)
56		- #set ($transformedName = $services.modelvalidation.transformName($requestedName))
57		- #set ($spaceReference = $services.model.createSpaceReference($transformedName, $parentReference.lastSpaceReference))
58		- #set ($documentReference = $services.model.createDocumentReference('WebHome', $spaceReference))
59		- #set ($location = $NULL)
60		- #computeInfoFromReference($documentReference $location)
61		- #set ($discard = $result.add({
62		- 'reference': $services.model.serialize($documentReference, 'default'),
63		- 'type': 'resolvedInSpace',
64		- 'location': $location
65		- }))
66	66	#jsonResponse($result)
67		-#end
68		-{{/velocity}}
69		-{{velocity}}
70		-#if ($xcontext.action == 'get' && $request.input != '' && $request.action != '')
	77	+#end{{/velocity}}
	78	+{{velocity}}#if ($xcontext.action == 'get' && $request.input != '' && $request.action != '')
71	71	#if ($request.action == 'suggest')
72	72	#handleSuggestionRequest()
73	73	#elseif ($request.action == 'validate')
...	...	@@ -75,5 +75,4 @@
75	75	#end
76	76	#else
77	77	Technical page to help using the name strategy when suggesting links.
78		-#end
79		-{{/velocity}}
	86	+#end{{/velocity}}