diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py --- a/kallithea/controllers/admin/repo_groups.py +++ b/kallithea/controllers/admin/repo_groups.py @@ -72,10 +72,6 @@ class RepoGroupsController(BaseControlle c.repo_groups = [rg for rg in repo_groups if rg[0] not in exclude_group_ids] - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() - def __load_data(self, group_id): """ Load defaults settings for edit, and update diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py --- a/kallithea/controllers/admin/repos.py +++ b/kallithea/controllers/admin/repos.py @@ -246,7 +246,6 @@ class ReposController(BaseRepoController log.info(errors) defaults = self.__load_data() defaults.update(errors.value) - c.users_array = repo_model.get_users_js() return htmlfill.render( render('admin/repos/repo_edit.html'), defaults=defaults, @@ -303,8 +302,6 @@ class ReposController(BaseRepoController defaults = self.__load_data() c.repo_fields = RepositoryField.query() \ .filter(RepositoryField.repository == c.repo_info).all() - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() c.active = 'settings' return htmlfill.render( render('admin/repos/repo_edit.html'), @@ -315,9 +312,6 @@ class ReposController(BaseRepoController @HasRepoPermissionLevelDecorator('admin') def edit_permissions(self, repo_name): c.repo_info = self._load_repo() - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() c.active = 'permissions' defaults = RepoModel()._get_defaults(repo_name) diff --git a/kallithea/controllers/admin/user_groups.py b/kallithea/controllers/admin/user_groups.py --- a/kallithea/controllers/admin/user_groups.py +++ b/kallithea/controllers/admin/user_groups.py @@ -243,10 +243,6 @@ class UserGroupsController(BaseControlle c.user_group = UserGroup.get_or_404(id) c.active = 'perms' - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() - defaults = {} # fill user group users for p in c.user_group.user_user_group_to_perm: diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py --- a/kallithea/controllers/changeset.py +++ b/kallithea/controllers/changeset.py @@ -198,7 +198,6 @@ class ChangesetController(BaseRepoContro def __load_data(self): repo_model = RepoModel() c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() def _index(self, revision, method): c.pull_request = None diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -459,7 +459,6 @@ class PullrequestsController(BaseRepoCon def show(self, repo_name, pull_request_id, extra=None): repo_model = RepoModel() c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() c.pull_request = PullRequest.get_or_404(pull_request_id) c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request) cc_model = ChangesetCommentsModel() diff --git a/kallithea/model/repo.py b/kallithea/model/repo.py --- a/kallithea/model/repo.py +++ b/kallithea/model/repo.py @@ -136,18 +136,6 @@ class RepoModel(object): 'gravatar_size': 14, } 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) \ - .all() - user_groups = UserGroupList(user_groups, perm_level='read') - return [ - { - 'id': gr.users_group_id, - 'grname': gr.users_group_name, - } for gr in user_groups] - @classmethod def _render_datatable(cls, tmpl, *args, **kwargs): import kallithea diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html @@ -117,7 +117,7 @@ ${h.end_form()} $('#add_perm_input').hide(); } $('#add_perm').click(function () { - addPermAction('group', ${h.js(c.users_array)}, ${h.js(c.user_groups_array)}); + addPermAction('group'); }); }); diff --git a/kallithea/templates/admin/repos/repo_edit_permissions.html b/kallithea/templates/admin/repos/repo_edit_permissions.html --- a/kallithea/templates/admin/repos/repo_edit_permissions.html +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html @@ -101,7 +101,7 @@ ${h.end_form()} $('#add_perm_input').hide(); } $('#add_perm').click(function () { - addPermAction('repository', ${h.js(c.users_array)}, ${h.js(c.user_groups_array)}); + addPermAction('repository'); }); }); diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html --- a/kallithea/templates/admin/repos/repo_edit_settings.html +++ b/kallithea/templates/admin/repos/repo_edit_settings.html @@ -120,7 +120,6 @@ ${h.form(url('update_repo', repo_name=c. }); // autocomplete - var _USERS_AC_DATA = ${h.js(c.users_array)}; - SimpleUserAutoComplete($('#owner'), _USERS_AC_DATA); + SimpleUserAutoComplete($('#owner')); }); diff --git a/kallithea/templates/admin/user_groups/user_group_edit_perms.html b/kallithea/templates/admin/user_groups/user_group_edit_perms.html --- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html @@ -106,7 +106,7 @@ ${h.end_form()} $('#add_perm_input').hide(); } $('#add_perm').click(function () { - addPermAction('usergroup', ${h.js(c.users_array)}, ${h.js(c.user_groups_array)}); + addPermAction('usergroup'); }); }); diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -24,7 +24,6 @@ ${self.repo_context_bar('changelog', c.c diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -323,7 +323,6 @@ ${self.repo_context_bar('showpullrequest