Mercurial > kallithea
changeset 6968:205daed7185b
users: remove code that is unused after most autocomplete has been switched to ajax
@mention support still require _USERS_AC_DATA as a global variable.
author | domruf <dominikruf@gmail.com> |
---|---|
date | Wed, 11 Oct 2017 19:37:03 +0200 |
parents | 6c3bda995a88 |
children | d44232c8d76a |
files | kallithea/controllers/admin/repo_groups.py kallithea/controllers/admin/repos.py kallithea/controllers/admin/user_groups.py kallithea/controllers/changeset.py kallithea/controllers/pullrequests.py kallithea/model/repo.py kallithea/templates/admin/repo_groups/repo_group_edit_perms.html kallithea/templates/admin/repos/repo_edit_permissions.html kallithea/templates/admin/repos/repo_edit_settings.html kallithea/templates/admin/user_groups/user_group_edit_perms.html kallithea/templates/changeset/changeset.html kallithea/templates/pullrequests/pullrequest_show.html |
diffstat | 12 files changed, 6 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/repo_groups.py Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/controllers/admin/repo_groups.py Wed Oct 11 19:37:03 2017 +0200 @@ -72,10 +72,6 @@ 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
--- a/kallithea/controllers/admin/repos.py Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/controllers/admin/repos.py Wed Oct 11 19:37:03 2017 +0200 @@ -246,7 +246,6 @@ 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 @@ 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 @@ @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)
--- a/kallithea/controllers/admin/user_groups.py Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/controllers/admin/user_groups.py Wed Oct 11 19:37:03 2017 +0200 @@ -243,10 +243,6 @@ 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:
--- a/kallithea/controllers/changeset.py Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/controllers/changeset.py Wed Oct 11 19:37:03 2017 +0200 @@ -198,7 +198,6 @@ 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
--- a/kallithea/controllers/pullrequests.py Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/controllers/pullrequests.py Wed Oct 11 19:37:03 2017 +0200 @@ -459,7 +459,6 @@ 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()
--- a/kallithea/model/repo.py Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/model/repo.py Wed Oct 11 19:37:03 2017 +0200 @@ -136,18 +136,6 @@ '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
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Wed Oct 11 19:37:03 2017 +0200 @@ -117,7 +117,7 @@ $('#add_perm_input').hide(); } $('#add_perm').click(function () { - addPermAction('group', ${h.js(c.users_array)}, ${h.js(c.user_groups_array)}); + addPermAction('group'); }); }); </script>
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Wed Oct 11 19:37:03 2017 +0200 @@ -101,7 +101,7 @@ $('#add_perm_input').hide(); } $('#add_perm').click(function () { - addPermAction('repository', ${h.js(c.users_array)}, ${h.js(c.user_groups_array)}); + addPermAction('repository'); }); }); </script>
--- a/kallithea/templates/admin/repos/repo_edit_settings.html Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Wed Oct 11 19:37:03 2017 +0200 @@ -120,7 +120,6 @@ }); // autocomplete - var _USERS_AC_DATA = ${h.js(c.users_array)}; - SimpleUserAutoComplete($('#owner'), _USERS_AC_DATA); + SimpleUserAutoComplete($('#owner')); }); </script>
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html Wed Oct 11 19:37:03 2017 +0200 @@ -106,7 +106,7 @@ $('#add_perm_input').hide(); } $('#add_perm').click(function () { - addPermAction('usergroup', ${h.js(c.users_array)}, ${h.js(c.user_groups_array)}); + addPermAction('usergroup'); }); }); </script>
--- a/kallithea/templates/changeset/changeset.html Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/templates/changeset/changeset.html Wed Oct 11 19:37:03 2017 +0200 @@ -24,7 +24,6 @@ </div> <script> var _USERS_AC_DATA = ${h.js(c.users_array)}; - var _GROUPS_AC_DATA = ${h.js(c.user_groups_array)}; AJAX_COMMENT_URL = ${h.js(url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id))}; AJAX_COMMENT_DELETE_URL = ${h.js(url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__'))}; </script>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Sun Aug 06 12:36:57 2017 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Wed Oct 11 19:37:03 2017 +0200 @@ -323,7 +323,6 @@ </div> <script> var _USERS_AC_DATA = ${h.js(c.users_array)}; - var _GROUPS_AC_DATA = ${h.js(c.user_groups_array)}; // TODO: switch this to pyroutes AJAX_COMMENT_URL = ${h.js(url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id))}; AJAX_COMMENT_DELETE_URL = ${h.js(url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__'))}; @@ -356,8 +355,8 @@ <script type="text/javascript"> $(document).ready(function(){ - PullRequestAutoComplete($('#user'), _USERS_AC_DATA); - SimpleUserAutoComplete($('#owner'), _USERS_AC_DATA); + PullRequestAutoComplete($('#user')); + SimpleUserAutoComplete($('#owner')); $('.code-difftable').on('click', '.add-bubble', function(e){ show_comment_form($(this));