kallithea Changeset - 862e55888ff8

Changeset - 862e55888ff8

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 8 years ago 2017-08-06 12:36:57
dominikruf@gmail.com

js: don't show number of members of groups when doing autocomplete

This is done to make the database queries cheaper.

3 files changed with 2 insertions and 7 deletions:

kallithea/model/repo.py

kallithea/public/js/base.js

kallithea/templates/base/root.html

0 comments (0 inline, 0 general)

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -137,20 +137,18 @@ class RepoModel(object): @@
             } for u in users]
     def get_user_groups_js(self):
         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
     def _render_datatable(cls, tmpl, *args, **kwargs):
         import kallithea
         from tg import tmpl_context as c, request, app_globals

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1106,17 +1106,15 @@ var autocompleteFormatter = function (oR @@
     else if (sResultMatch && sResultMatch.term) // select2 - parameter names doesn't match
         query = sResultMatch.term.toLowerCase();
     // 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);
+    }
     // users
     if (oResultData.nname) {
         var displayname = autocompleteHighlightMatch(oResultData.nname, query);

kallithea/templates/base/root.html

➞

Show inline comments

@@ @@ -28,13 +28,12 @@ @@
                 'Submitting ...': ${h.jshtml(_("Submitting ..."))},
                 'Unable to post': ${h.jshtml(_("Unable to post"))},
                 'Add Another Comment': ${h.jshtml(_("Add Another Comment"))},
                 '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'))},
                 'No matching files': ${h.jshtml(_('No matching files'))},
                 'Open New Pull Request from {0}': ${h.jshtml(_('Open New Pull Request from {0}'))},
                 'Open New Pull Request for {0} &rarr; {1}': ${h.js(_('Open New Pull Request for {0} &rarr; {1}'))},

0 comments (0 inline, 0 general)