From a3e36fca8da3da0df2e82ad616fec911653e1347 Mon Sep 17 00:00:00 2001 From: Paul Adam Davis Date: Sun, 21 Dec 2014 22:05:55 +0000 Subject: [PATCH] Fix broken user list paginated scrolling Closes #4695 - Adds a new class to the template and minor CSS to allow user list scroll events to work --- core/client/assets/sass/layouts/users.scss | 11 +++++++++++ core/client/templates/settings/users/index.hbs | 2 +- core/client/views/settings/users/users-list-view.js | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/core/client/assets/sass/layouts/users.scss b/core/client/assets/sass/layouts/users.scss index 3d6f1a7ddee2..075fb0a061f1 100644 --- a/core/client/assets/sass/layouts/users.scss +++ b/core/client/assets/sass/layouts/users.scss @@ -4,6 +4,7 @@ // Styles for the Users list page // Slug: /ghost/settings/users/ // +// * Container // * Users List // * Role Labels // * User Actions @@ -11,6 +12,16 @@ // ------------------------------------------------------------ +// +// Wrapper +// -------------------------------------------------- + +.users-list-wrapper { + overflow: auto; + height: 100%; +} + + // // Users List // -------------------------------------------------- diff --git a/core/client/templates/settings/users/index.hbs b/core/client/templates/settings/users/index.hbs index 880eae1a827d..1145c15c56b3 100644 --- a/core/client/templates/settings/users/index.hbs +++ b/core/client/templates/settings/users/index.hbs @@ -1,4 +1,4 @@ -{{#view "settings/users/users-list-view"}} +{{#view "settings/users/users-list-view" class="users-list-wrapper js-users-list-view"}}
{{#link-to "settings" class="btn btn-default btn-back"}}Back{{/link-to}}

Users

diff --git a/core/client/views/settings/users/users-list-view.js b/core/client/views/settings/users/users-list-view.js index 57cef0269328..fc3b75a8cb80 100644 --- a/core/client/views/settings/users/users-list-view.js +++ b/core/client/views/settings/users/users-list-view.js @@ -1,7 +1,7 @@ import PaginationViewMixin from 'ghost/mixins/pagination-view-infinite-scroll'; var UsersListView = Ember.View.extend(PaginationViewMixin, { - classNames: ['settings-users'] + classNames: ['js-users-list-view'] }); export default UsersListView;