Перейти к содержимому

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

Редактировал(а) Георгий Глущенко 2026/07/02 18:23
От версии 1.1
отредактировано superadmin
на 2020/10/06 10:51
Изменить комментарий: Install extension [org.xwiki.platform:xwiki-platform-user-directory-ui/12.8]
К версии 4.1
отредактировано Георгий Глущенко
на 2026/07/02 18:23
Изменить комментарий: Install extension [org.xwiki.platform:xwiki-platform-user-directory-ui/18.5.0]

Сводка

Подробности

Свойства страницы
Автор документа
... ... @@ -1,1 +1,1 @@
1 -XWiki.superadmin
1 +xwiki:XWiki.ggv
Содержимое
... ... @@ -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'))
100 + #elseif ($classPropertyType.endsWith('TextArea') || $classPropertyType.endsWith('Email') || $classPropertyType.endsWith('Groups') || $classPropertyType == 'String')
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}}$services.localization.render('platform.userdirectory.customizeNotAllowed'){{/error}}
176 + {{error}}{{translation key="platform.userdirectory.customizeNotAllowed"/}}{{/error}}
177 177   #else
178 178   #handleUserDirectoryAction()
179 179   ##
... ... @@ -238,8 +238,7 @@
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 = $stringtool.removeEnd($stringtool.removeStart($object.display($propertyName, $action),
242 - '{{html clean="false" wiki="false"}}'), '{{/html}}'))
241 + #set ($fieldDisplay = "#unwrapXPropertyDisplay($object.display($propertyName, $action))")
243 243   <dt>
244 244   <label #if ($action == 'edit' && !$isCheckbox)
245 245   for="$escapetool.xml("${object.xWikiClass.name}_${object.number}_$propertyName")"#end>
... ... @@ -266,24 +266,19 @@
266 266   #displayUserDirectoryCustomizationForm()
267 267   #elseif ($isCustomized)
268 268   {{warning}}
269 - $services.localization.render('xe.userdirectory.isCustomizedWarning', [
270 - "$doc.fullName",
271 - $escapetool.url({
272 - 'customize': true,
273 - 'action': 'reset',
274 - 'xredirect': $xredirect
275 - }),
276 - "$doc.fullName",
277 - 'customize=true'
278 - ])
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"]]
279 279   {{/warning}}
280 280   #elseif ($isGuest)
281 281   {{info}}
282 - $services.localization.render('xe.userdirectory.canCustomizeInfoGuest', ["path:$doc.getURL('login')"])
274 + {{translation key="platform.userdirectory.canCustomizeInfoGuest"/}}
283 283   {{/info}}
284 284   #else
285 285   {{info}}
286 - $services.localization.render('xe.userdirectory.canCustomizeInfo', ["$doc.fullName", 'customize=true'])
278 + {{translation key="platform.userdirectory.canCustomizeInfo"/}}
279 +
280 + [[{{translation key="platform.userdirectory.customizeButton"/}}>>||queryString="customize=true" class="btn btn-default"]]
287 287   {{/info}}
288 288   #end
289 289  #end
XWiki.JavaScriptExtension[0]
Код
... ... @@ -25,7 +25,7 @@
25 25   /**
26 26   * Live preview when the User Directory settings are modified.
27 27   */
28 - $('form.user-directory-settings').change(function(event) {
28 + $('form.user-directory-settings').on('change', function(event) {
29 29   // Default on user-level configuration.
30 30   var configDocument = XWiki.currentDocument;
31 31   if (configDocument.page !== 'UserDirectory' || configDocument.space !== 'Main') {
... ... @@ -36,7 +36,7 @@
36 36   var data = $(this).serialize();
37 37   var oldLiveTableContainer = $('.xwiki-livetable-container').addClass('loading');
38 38   // We can't use load() here because the live table has in-line script tags that have to be evaluated.
39 - $.get(url, data).done(function(html) {
39 + $.get(url, data).then(html => {
40 40   var newLiveTableContainer = $('<div/>').html(html).find('.xwiki-livetable-container');
41 41   oldLiveTableContainer.replaceWith(newLiveTableContainer);
42 42   $(document).trigger('xwiki:dom:updated', {elements: newLiveTableContainer.toArray()});
... ... @@ -46,7 +46,7 @@
46 46   /**
47 47   * User scope filtering (for sub-wikis).
48 48   */
49 - $('#userScopeFilter').change(function(event) {
49 + $('#userScopeFilter').on('change', function(event) {
50 50   var value = $(this).val();
51 51   // The live table is recreated when an user directory setting is changed (live preview) so we can't cache the
52 52   // reference to the live table instance.