Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Osseman <joey.osseman@gmail.com>2018-10-07 21:49:55 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2018-10-07 21:49:55 +0300
commit475022f41635ae0e42226f58ff9b346597d23f2e (patch)
tree8f5616f761352d7d6678bd736c3fa9d75824c70f /plugins/UsersManager
parentb1ff5e6afa94f1079e2afce96b58035a675eeb81 (diff)
Scroll to content pane when editing a user (#13551)
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/angularjs/users-manager/users-manager.component.html2
-rw-r--r--plugins/UsersManager/angularjs/users-manager/users-manager.component.js11
2 files changed, 10 insertions, 3 deletions
diff --git a/plugins/UsersManager/angularjs/users-manager/users-manager.component.html b/plugins/UsersManager/angularjs/users-manager/users-manager.component.html
index 9db7f9f04f..41232ad3e2 100644
--- a/plugins/UsersManager/angularjs/users-manager/users-manager.component.html
+++ b/plugins/UsersManager/angularjs/users-manager/users-manager.component.html
@@ -29,7 +29,7 @@
</div>
<piwik-paged-users-list
- on-edit-user="$ctrl.isEditing = true; $ctrl.userBeingEdited = user;"
+ on-edit-user="$ctrl.onEditUser(user)"
on-change-user-role="$ctrl.onChangeUserRole(users, role)"
on-delete-user="$ctrl.onDeleteUser(users)"
on-search-change="$ctrl.searchParams = params; $ctrl.fetchUsers();"
diff --git a/plugins/UsersManager/angularjs/users-manager/users-manager.component.js b/plugins/UsersManager/angularjs/users-manager/users-manager.component.js
index 9b18e896ff..d5292174bd 100644
--- a/plugins/UsersManager/angularjs/users-manager/users-manager.component.js
+++ b/plugins/UsersManager/angularjs/users-manager/users-manager.component.js
@@ -22,9 +22,9 @@
controller: UsersManagerController
});
- UsersManagerController.$inject = ['$element', 'piwikApi', '$q'];
+ UsersManagerController.$inject = ['$element', 'piwik', 'piwikApi', '$q', '$timeout'];
- function UsersManagerController($element, piwikApi, $q) {
+ function UsersManagerController($element, piwik, piwikApi, $q, $timeout) {
var vm = this;
vm.isEditing = false;
vm.isCurrentUserSuperUser = true;
@@ -38,6 +38,7 @@
vm.$onInit = $onInit;
vm.$onChanges = $onChanges;
vm.$onDestroy = $onDestroy;
+ vm.onEditUser = onEditUser;
vm.onDoneEditing = onDoneEditing;
vm.showAddExistingUserModal = showAddExistingUserModal;
vm.onChangeUserRole = onChangeUserRole;
@@ -167,6 +168,12 @@
});
}
+ function onEditUser(user) {
+ piwik.helper.lazyScrollToContent();
+ vm.isEditing = true;
+ vm.userBeingEdited = user;
+ }
+
function onDoneEditing(isUserModified) {
vm.isEditing = false;
if (isUserModified) { // if a user was modified, we must reload the users list