Modifications pour le document AdminUsersSheet

Modifié par Florent Charton le 2025/08/19 15:15

Gérer
- Copier
Actions
- Exporter
- Aperçu avant impression
Affichage

Depuis la version 1.1

modifié par superadmin
sur 2022/06/20 08:48

Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-administration-ui/13.10.6]

À la version 4.1

modifié par Florent Charton
sur 2025/08/19 15:15

Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-administration-ui/17.4.3]

Source
Rendu

Résumé

Propriétés de la Page (3 modifications, 0 ajouts, 0 suppressions)
Objets (2 modifications, 0 ajouts, 0 suppressions)
- XWiki.JavaScriptExtension[0]
- XWiki.StyleSheetExtension[0]

Détails

Propriétés de la Page

Auteur du document

@@ -1,1 +1,1 @@
--XWiki.superadmin
++xwiki:XWiki.fcharton

Syntaxe

@@ -1,1 +1,1 @@
--XWiki 2.0
++XWiki 2.1

Contenu

@@ -1,49 +1,88 @@
  {{velocity output="false"}}
--#macro (userScopeFilter)
--  <select name="wiki">
--    <option selected="selected" value="local">
--      $escapetool.xml($services.localization.render('rightsmanager.local'))
--    </option>
--    <option value="global">
--      $escapetool.xml($services.localization.render('rightsmanager.global'))
--    </option>
--    <option value="both">
--      $escapetool.xml($services.localization.render('rightsmanager.both'))
--    </option>
--  </select>
--#end
--
--#macro (displayUsersLiveTable)
--  #set ($columnOptions = {
--    'name': {'type': 'text', 'sortable': false, 'html': true},
--    'first_name': {'type': 'text', 'sortable': false},
--    'last_name': {'type': 'text', 'sortable': false},
--    'scope': {'type': 'list', 'sortable': false},
--    '_actions': {
--      'actions': [
--        'edit',
--        {'id': 'disable', 'icon': 'lock'},
--        {'id': 'enable', 'icon': 'unlock'},
--        'delete'
--      ],
--      'labels': false
--    }
++#macro (displayUsersLiveData)
++  #set ($properties = ['name', 'first_name', 'last_name', '_actions'])
++  #set ($sourceParameters = {
++    'template': 'getusers.vm',
++    'translationPrefix': 'xe.admin.users.'
    })
--  #set ($columns = ['name', 'first_name', 'last_name', '_actions'])
--  #set ($liveTableOptions = {
--    'url': $doc.getURL('view', 'xpage=getusers'),
--    'translationPrefix': 'xe.admin.users.',
--    'outputOnlyHtml': true
--  })
    #if (!$xcontext.isMainWiki())
--    #set ($discard = $columns.add(3, 'scope'))
--    ## We use the top filters option to show only the local users by default because the JavaScript code from the sheet
--    ## is executed after the livetable is loaded. The JavaScript code removes the top filters and updates the scope filter
--    ## afterwards.
--    #set ($liveTableOptions.topFilters = "#userScopeFilter")
++    #set ($discard = $properties.add(3, 'scope'))
    #end
    <div class="medium-avatars">
--    #livetable('userstable' $columns $columnOptions $liveTableOptions)
++    $services.liveData.render({
++      'id': 'userstable',
++      'source': 'liveTable',
++      'properties': $stringtool.join($properties, ','),
++      'sourceParameters': $escapetool.url($sourceParameters)
++    }, {
++      'query': {
++        'filters': [
++          {
++            'property': 'scope',
++            'constraints': [{
++              'operator': 'contains',
++              'value': 'local'
++            }]
++          }
++        ]
++      },
++      'meta': {
++        'propertyDescriptors': [
++          {
++            'id': 'name',
++            'displayer': 'html',
++            'sortable': false,
++            'editable': false
++          },
++          {
++            'id': 'first_name',
++            'sortable': false,
++            'editable': false
++          },
++          {
++            'id': 'last_name',
++            'sortable': false,
++            'editable': false
++          },
++          {
++            'id': 'scope',
++            'sortable': false,
++            'editable': false,
++            'filter': {
++              'id': 'list',
++              'options': [
++                {'value': 'local', 'label': $services.localization.render('rightsmanager.local')},
++                {'value': 'global', 'label': $services.localization.render('rightsmanager.global')},
++                {'value': 'both', 'label': $services.localization.render('rightsmanager.both')}
++              ]
++            }
++          },
++          {
++            'id': '_actions',
++            'displayer': {
++              'id': 'actions',
++              'actions': ['edit', 'disable', 'enable', 'delete']
++            }
++          }
++        ],
++        'actions': [
++          {
++            'id': 'disable',
++            'icon': 'lock',
++            'allowProperty': 'doc.hasdisable',
++            'urlProperty': 'doc.disable_url',
++            'extraIconClasses': 'text-warning'
++          },
++          {
++            'id': 'enable',
++            'icon': 'unlock',
++            'allowProperty': 'doc.hasenable',
++            'urlProperty': 'doc.enable_url',
++            'extraIconClasses': 'text-success'
++          }
++        ]
++      }
++    })
    </div>
    <p>
      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="${escapetool.h}createUserModal"
@@ -83,7 +83,7 @@
  #macro (editUserModal)
    <div class="modal" id="editUserModal" tabindex="-1" role="dialog" aria-labelledby="editUserModal-label"
--      data-backdrop="static" data-keyboard="false" data-liveTable="#userstable" data-liveTableAction="edit">
++      data-backdrop="static" data-keyboard="false" data-live-data="#userstable" data-live-data-action="edit">
      <div class="modal-dialog modal-lg" role="document">
        <div class="modal-content">
          <div class="modal-header">
@@ -113,7 +113,7 @@
    ## have script or programming rights.
    #userPicker_import
    <div class="modal" id="deleteUserModal" tabindex="-1" role="dialog" aria-labelledby="deleteUserModal-label"
--      data-liveTable="#userstable" data-liveTableAction="delete">
++      data-live-data="#userstable" data-live-data-action="delete">
      <div class="modal-dialog" role="document">
        <div class="modal-content">
          <div class="modal-header">
@@ -167,11 +167,13 @@
  #macro (maybeShowDeleteUserWarning $userReference $right)
    #countPagesLastModifiedBy($userReference)
    #if ($pageCount > 0)
--    <div class="box errormessage xform">
++    {{/html}}
++
++    {{error cssClass="xform"}}
++      {{html}}
        #set ($pageIndexReference = $services.model.createDocumentReference(
          $userReference.wikiReference.name, 'Main', 'AllDocs'))
--      #set ($pageIndexURL = $xwiki.getURL($pageIndexReference) + '#|t=alldocs&doc.author=' +
--        $escapetool.url($services.model.serialize($userReference, 'local')))
++      #set ($pageIndexURL = $xwiki.getURL($pageIndexReference, 'view', "doc.author=${escapetool.url($services.model.serialize($userReference, 'local'))}"))
        #set ($translationKey = "administration.section.users.deleteUser.${right}RightsWarning")
        $services.localization.render($translationKey, ["<a href='$pageIndexURL'>", $pageCount, '</a>'])
        <dl>
@@ -196,7 +196,10 @@
              [$rightTranslation]))</span>
          </dd>
        </dl>
--    </div>
++      {{/html}}
++    {{/error}}
++
++    {{html clean="false"}}
    #end
  #end
@@ -249,10 +249,10 @@
      #set ($discard = $xwiki.jsx.use("XWiki.AdminUsersSheet"))
      {{html clean="false"}}
--    #displayUsersLiveTable
--    #createUserModal
--    #editUserModal
--    #deleteUserModal
++    #displayUsersLiveData()
++    #createUserModal()
++    #editUserModal()
++    #deleteUserModal()
      {{/html}}
    #end
  #end

XWiki.JavaScriptExtension[0]

Code

@@ -1,19 +1,10 @@
  require.config({
    paths: {
--    'xwiki-livetable-modal': new XWiki.Document('AdminGroupsSheet', 'XWiki').getURL('jsx', 'r=1')
++    'xwiki-livedata-modal': new XWiki.Document('AdminGroupsSheet', 'XWiki').getURL('jsx', 'r=1')
    }
  });
--//
--// Scope Filtering
--//
--require(['jquery'], function($) {
--  var options = $('#userstable').prev('.tipfilters').remove().find('select[name="wiki"]').html();
--  var scopeFilter = $('#userstable .xwiki-livetable-display-filters select[name="scope"]')
--  scopeFilter.attr('name', 'wiki').html(options);
--});
--
--require(['jquery', 'xwiki-meta', 'xwiki-livetable-modal', 'xwiki-events-bridge'], function($, xm) {
++require(['jquery', 'xwiki-meta', 'xwiki-livedata-modal', 'xwiki-events-bridge'], function($, xm) {
    //
    // User Creation
    //
@@ -20,7 +20,7 @@
    var createUserModal = $('#createUserModal');
    var validateCreateUserForm = function(form) {
--    return form.size() > 0 && (!window.LiveValidation ||
++    return form.length && (!window.LiveValidation ||
        LiveValidation.massValidate(LiveValidationForm.getInstance(form[0]).fields));
    };
@@ -35,7 +35,7 @@
        createUserModalBody.removeClass('loading').append(createUserForm);
        $(document).trigger('xwiki:dom:updated', {'elements': createUserModalBody.toArray()});
        createUserForm.find(':input').filter(':visible').first().focus();
--      createUserButton.prop('disabled', createUserForm.size() === 0);
++      createUserButton.prop('disabled', !createUserForm.length);
      });
    }).on('click', '.btn-primary', function(event) {
      var createUserForm = createUserModal.find('form#register');
@@ -47,14 +47,14 @@
        $jsontool.serialize($services.localization.render('xe.admin.users.create.inProgress')),
        'inprogress'
      );
--    $.post(createUserForm.attr('action'), createUserForm.serialize()).done(function(html) {
++    $.post(createUserForm.attr('action'), createUserForm.serialize()).then(html => {
        var errorMessage = $('<div/>').html(html).find('.errormessage, .LV_validation_message.LV_invalid');
--      if (errorMessage.size() > 0) {
++      if (errorMessage.length) {
          createUserButton.prop('disabled', false);
          notification.replace(new XWiki.widgets.Notification(errorMessage.text(), 'error'));
        } else {
          createUserModal.modal('hide');
--        window.livetable_userstable.refresh();
++        $('#userstable').data('liveData').updateEntries();
          $('#userstable').trigger('xwiki:user:created');
          notification.replace(new XWiki.widgets.Notification(
            $jsontool.serialize($services.localization.render('xe.admin.users.create.done')),
@@ -61,7 +61,7 @@
            'done'
          ));
        }
--    }).fail(function (response) {
++    }).catch(() => {
        createUserButton.prop('disabled', false);
        notification.replace(new XWiki.widgets.Notification(
          $jsontool.serialize($services.localization.render('xe.admin.users.create.failed')),
@@ -78,7 +78,7 @@
    var loadEditForm = function(forceLock) {
      var saveButton = editUserModal.find('.btn-primary').prop('disabled', true);
      var rowData = editUserModal.data('rowData');
--    var userReference = XWiki.Model.resolve(rowData.doc_fullName, XWiki.EntityType.DOCUMENT, [rowData.doc_wiki]);
++    var userReference = XWiki.Model.resolve(rowData['doc.fullName'], XWiki.EntityType.DOCUMENT, [rowData['doc.wiki']]);
      var userDocument = new XWiki.Document(userReference);
      var editUserURL = userDocument.getURL('edit');
      var parameters = {xpage: 'edituser'};
@@ -92,7 +92,7 @@
        $(document).trigger('xwiki:dom:updated', {'elements': self.toArray()});
        var editUserForm = editUserModal.find('form#edituser');
        editUserForm.find(':input').filter(':visible').first().focus();
--      saveButton.prop('disabled', editUserForm.size() === 0);
++      saveButton.prop('disabled', !editUserForm.length);
      });
    };
@@ -110,14 +110,14 @@
        'inprogress'
      );
      $(document).trigger('xwiki:actions:beforeSave');
--    $.post(editForm.attr('action'), editForm.serialize()).done(function() {
++    $.post(editForm.attr('action'), editForm.serialize()).then(() => {
        $(document).trigger('xwiki:document:saved');
--      editUserModal.modal('hide').data('liveTable').refresh();
++      editUserModal.modal('hide').data('liveDataElement').data('liveData').updateEntries();
        notification.replace(new XWiki.widgets.Notification(
          $jsontool.serialize($services.localization.render('core.editors.saveandcontinue.notification.done')),
          'done'
        ));
--    }).fail(function (response) {
++    }).catch(response => {
        saveButton.prop('disabled', false);
        var message = $jsontool.serialize($services.localization.render('core.editors.saveandcontinue.notification.error',
          ['__reason__']));
@@ -146,29 +146,32 @@
          failed: $jsontool.serialize($services.localization.render('administration.section.users.disableUser.failed'))
        }
      }
--    var onToggleUser = function(action, event) {
--      event.preventDefault();
--      var actionTrigger = $(this);
--      if (actionTrigger.hasClass('pending')) {
--        // Another request is already in progress.
--        return;
--      }
--      actionTrigger.addClass('pending');
--      var notification = new XWiki.widgets.Notification(notificationMessage[action].inProgress, 'inprogress');
--      // The enable and disable actions redirect to the user profile by default which may take a lot of time to render so
--      // we redirect to a URL that doesn't render anything.
--      var emptyResponseURL = new XWiki.Document('AdminUsersSheet', 'XWiki').getURL('get', 'outputSyntax=plain');
--      $.post(actionTrigger.attr('href'), {'xredirect': emptyResponseURL}).done(function() {
--        window['livetable_userstable'].refresh();
--        notification.replace(new XWiki.widgets.Notification(notificationMessage[action].done, 'done'));
--      }).fail(function() {
--        notification.replace(new XWiki.widgets.Notification(notificationMessage[action].failed, 'error'));
--      }).always(function() {
--        actionTrigger.removeClass('pending');
--      });
--    };
--    $('#userstable').on('click', 'a.actionenable', $.proxy(onToggleUser, null, 'enable'));
--    $('#userstable').on('click', 'a.actiondisable', $.proxy(onToggleUser, null, 'disable'));
++
++    function onToggleUser(action) {
++      return function (event) {
++        event.preventDefault();
++        var actionTrigger = $(this);
++        if (actionTrigger.hasClass('pending')) {
++          // Another request is already in progress.
++          return;
++        }
++        actionTrigger.addClass('pending');
++        var notification = new XWiki.widgets.Notification(notificationMessage[action].inProgress, 'inprogress');
++        // The enable and disable actions redirect to the user profile by default which may take a lot of time to
++        // render so we redirect to a URL that doesn't render anything.
++        var emptyResponseURL = new XWiki.Document('AdminUsersSheet', 'XWiki').getURL('get', 'outputSyntax=plain');
++        Promise.resolve($.post(actionTrigger.attr('href'), {'xredirect': emptyResponseURL})).then(function () {
++          $('#userstable').data('liveData').updateEntries();
++          notification.replace(new XWiki.widgets.Notification(notificationMessage[action].done, 'done'));
++        }).catch(function () {
++          notification.replace(new XWiki.widgets.Notification(notificationMessage[action].failed, 'error'));
++        }).finally(function () {
++          actionTrigger.removeClass('pending');
++        });
++      };
++    }
++    $(document).on('click', '#userstable a.action_enable', onToggleUser('enable'));
++    $(document).on('click', '#userstable a.action_disable', onToggleUser('disable'));
    })();
    //
@@ -202,9 +202,9 @@
    deleteUserModal.on('show.bs.modal', function() {
      var rowData = deleteUserModal.data('rowData');
--    var userReference = rowData.doc_fullName;
--    if (XWiki.currentWiki !== rowData.doc_wiki) {
--      userReference = XWiki.Model.resolve(userReference, XWiki.EntityType.DOCUMENT, [rowData.doc_wiki]);
++    var userReference = rowData['doc.fullName'];
++    if (XWiki.currentWiki !== rowData['doc.wiki']) {
++      userReference = XWiki.Model.resolve(userReference, XWiki.EntityType.DOCUMENT, [rowData['doc.wiki']]);
        userReference = XWiki.Model.serialize(userReference);
      }
      deleteUserModal.data('userReference', userReference);
@@ -225,9 +225,9 @@
          newAuthor: newAuthor,
          requiredRight: requiredRight
        });
--      return newAuthorValidationRequest;
++      return Promise.resolve(newAuthorValidationRequest);
      } else {
--      return $.Deferred().resolve({valid: true}).promise();
++      return Promise.resolve({valid: true});
      }
    };
    deleteUserModal.on('change', '#newAuthor', function(event) {
@@ -236,17 +236,17 @@
      var newAuthorField = $(event.target);
      // Hide the previous error message.
      newAuthorField.nextAll('.xErrorMsg').addClass('hidden');
--    validateNewAuthor(newAuthorField.val(), newAuthorField.data('requiredRight')).done(function(result) {
++    validateNewAuthor(newAuthorField.val(), newAuthorField.data('requiredRight')).then(function(result) {
        if (result.valid === false) {
          newAuthorField.nextAll('.xErrorMsg').removeClass('hidden');
        }
--    }).always(function() {
++    }).finally(function() {
        // Re-enable the modal submit button.
        deleteUserButton.prop('disabled', false);
      });
    });
--  deleteUserButton.click(function() {
++  deleteUserButton.on('click', function() {
      var notification = new XWiki.widgets.Notification(
        $jsontool.serialize($services.localization.render('xe.admin.users.delete.inProgress')),
        'inprogress'
@@ -257,14 +257,14 @@
        docname: userReference,
        newAuthor: deleteUserModal.find('#newAuthor').val(),
        form_token: xm.form_token
--    }).done(function() {
--      deleteUserModal.data('liveTable').deleteRow(deleteUserModal.data('rowIndex'));
--      deleteUserModal.data('liveTableElement').trigger('xwiki:user:deleted', {reference: userReference});
++    }).then(() => {
++      deleteUserModal.data('liveDataElement').data('liveData').updateEntries();
++      deleteUserModal.data('liveDataElement').trigger('xwiki:user:deleted', {reference: userReference});
        notification.replace(new XWiki.widgets.Notification(
          $jsontool.serialize($services.localization.render('xe.admin.users.delete.done')),
          'done'
        ));
--    }).fail(function() {
++    }).catch(() => {
        notification.replace(new XWiki.widgets.Notification(
          $jsontool.serialize($services.localization.render('xe.admin.users.delete.failed')),
          'error'

XWiki.StyleSheetExtension[0]

Code

@@ -1,19 +3,4 @@
--#template('colorThemeInit.vm')
--
  /**
-- * Users Live Table
-- */
--#userstable td[data-title] {
--  vertical-align: middle;
--}
--#userstable .actiondisable .action-icon {
--  color: $theme.notificationWarningColor;
--}
--#userstable .actionenable .action-icon {
--  color: $theme.notificationSuccessColor;
--}
--
--/**
   * Delete User Modal
   */
  #deleteUserModal .userName {

Parser le contenu

@@ -1,1 +1,1 @@
--Oui
++Non

Content Type

@@ -1,1 +1,1 @@
--CSS
++LESS