Mercurial > kallithea
changeset 6930:862e55888ff8
js: don't show number of members of groups when doing autocomplete
This is done to make the database queries cheaper.
author | domruf <dominikruf@gmail.com> |
---|---|
date | Sun, 06 Aug 2017 12:36:57 +0200 |
parents | 6a5fb5070765 |
children | 6dd14c834acf |
files | kallithea/model/repo.py kallithea/public/js/base.js kallithea/templates/base/root.html |
diffstat | 3 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/repo.py Tue Sep 19 22:50:12 2017 +0200 +++ b/kallithea/model/repo.py Sun Aug 06 12:36:57 2017 +0200 @@ -140,14 +140,12 @@ user_groups = UserGroup.query() \ .filter(UserGroup.users_group_active == True) \ .order_by(UserGroup.users_group_name) \ - .options(subqueryload(UserGroup.members)) \ .all() user_groups = UserGroupList(user_groups, perm_level='read') return [ { 'id': gr.users_group_id, 'grname': gr.users_group_name, - 'grmembers': len(gr.members), } for gr in user_groups] @classmethod
--- a/kallithea/public/js/base.js Tue Sep 19 22:50:12 2017 +0200 +++ b/kallithea/public/js/base.js Sun Aug 06 12:36:57 2017 +0200 @@ -1109,11 +1109,9 @@ // group if (oResultData.grname) { return autocompleteGravatar( - "{0}: {1} ({2} {3})".format( + "{0}: {1}".format( _TM['Group'], - autocompleteHighlightMatch(oResultData.grname, query), - oResultData.grmembers, - _TM['members']), + autocompleteHighlightMatch(oResultData.grname, query)), null, null, true); }
--- a/kallithea/templates/base/root.html Tue Sep 19 22:50:12 2017 +0200 +++ b/kallithea/templates/base/root.html Sun Aug 06 12:36:57 2017 +0200 @@ -31,7 +31,6 @@ 'Stop following this repository': ${h.jshtml(_('Stop following this repository'))}, 'Start following this repository': ${h.jshtml(_('Start following this repository'))}, 'Group': ${h.jshtml(_('Group'))}, - 'members': ${h.jshtml(_('members'))}, 'Loading ...': ${h.jshtml(_('Loading ...'))}, 'loading ...': ${h.jshtml(_('loading ...'))}, 'Search truncated': ${h.jshtml(_('Search truncated'))},