Изменения документа User Directory Macros

Сводка

• Свойства страницы (2 изменено, 0 добавлено, 0 удалено)

Подробности

Свойства страницы

Автор документа

...	...	@@ -1,1 +1,1 @@
1		-xwiki:XWiki.ggv
	1	+xwiki:XWiki.gav

Содержимое

...	...	@@ -97,7 +97,7 @@
97	97	'sortable': false,
98	98	'filterable': false
99	99	}))
100		- #elseif ($classPropertyType.endsWith('TextArea') || $classPropertyType.endsWith('Email') || $classPropertyType.endsWith('Groups') || $classPropertyType == 'String')
	100	+ #elseif ($classPropertyType.endsWith('TextArea') || $classPropertyType.endsWith('Email') || $classPropertyType.endsWith('Groups'))
101	101	#set ($columnProperties.html = true)
102	102	#end
103	103	#set ($discard = $columnsProperties.put($column, $columnProperties))
...	...	@@ -173,7 +173,7 @@
173	173	##
174	174	#macro (displayUserDirectoryCustomizationForm)
175	175	#if (!$configurationDoc.hasAccessLevel('edit'))
176		- {{error}}{{translation key="platform.userdirectory.customizeNotAllowed"/}}{{/error}}
	176	+ {{error}}$services.localization.render('platform.userdirectory.customizeNotAllowed'){{/error}}
177	177	#else
178	178	#handleUserDirectoryAction()
179	179	##
...	...	@@ -238,7 +238,8 @@
238	238	#macro (displayProperty $propertyName $object $action)
239	239	#set ($propertyClass = $object.xWikiClass.get($propertyName))
240	240	#set ($isCheckbox = $propertyClass.getValue('displayFormType') == 'checkbox')
241		- #set ($fieldDisplay = "#unwrapXPropertyDisplay($object.display($propertyName, $action))")
	241	+ #set ($fieldDisplay = $stringtool.removeEnd($stringtool.removeStart($object.display($propertyName, $action),
	242	+ '{{html clean="false" wiki="false"}}'), '{{/html}}'))
242	242	<dt>
243	243	<label #if ($action == 'edit' && !$isCheckbox)
244	244	for="$escapetool.xml("${object.xWikiClass.name}_${object.number}_$propertyName")"#end>
...	...	@@ -265,19 +265,25 @@
265	265	#displayUserDirectoryCustomizationForm()
266	266	#elseif ($isCustomized)
267	267	{{warning}}
268		- {{translation key="platform.userdirectory.isCustomizedWarning"/}}
269		-
270		- [[{{translation key="platform.userdirectory.resetButton"/}}>>||queryString="customize=true&action=reset&xredirect=$escapetool.xml($xredirect)&form_token=$escapetool.xml($services.csrf.token)" class="btn btn-default"]] [[{{translation key="platform.userdirectory.customizeButton"/}}>>||queryString="customize=true" class="btn btn-default"]]
	269	+ $services.localization.render('xe.userdirectory.isCustomizedWarning', [
	270	+ "$doc.fullName",
	271	+ $escapetool.url({
	272	+ 'customize': true,
	273	+ 'action': 'reset',
	274	+ 'xredirect': $xredirect,
	275	+ 'form_token': $services.csrf.token
	276	+ }),
	277	+ "$doc.fullName",
	278	+ 'customize=true'
	279	+ ])
271	271	{{/warning}}
272	272	#elseif ($isGuest)
273	273	{{info}}
274		- {{translation key="platform.userdirectory.canCustomizeInfoGuest"/}}
	283	+ $services.localization.render('xe.userdirectory.canCustomizeInfoGuest', ["path:$doc.getURL('login')"])
275	275	{{/info}}
276	276	#else
277	277	{{info}}
278		- {{translation key="platform.userdirectory.canCustomizeInfo"/}}
279		-
280		- [[{{translation key="platform.userdirectory.customizeButton"/}}>>||queryString="customize=true" class="btn btn-default"]]
	287	+ $services.localization.render('xe.userdirectory.canCustomizeInfo', ["$doc.fullName", 'customize=true'])
281	281	{{/info}}
282	282	#end
283	283	#end