kallithea Changeset - 205daed7185b

Changeset - 205daed7185b

Parent rev.

Child rev.

[Not reviewed]

default

0 12 0

domruf - 8 years ago 2017-10-11 19:37:03
dominikruf@gmail.com

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.

12 files changed with 6 insertions and 37 deletions:

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

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -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

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -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)

kallithea/controllers/admin/user_groups.py

➞

Show inline comments

@@ @@ -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:

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -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

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -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()

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -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

kallithea/templates/admin/repo_groups/repo_group_edit_perms.html

➞

Show inline comments

@@ @@ -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');
         });
     });
 </script>

kallithea/templates/admin/repos/repo_edit_permissions.html

➞

Show inline comments

@@ @@ -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');
         });
     });
 </script>

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

@@ @@ -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'));
     });
 </script>

kallithea/templates/admin/user_groups/user_group_edit_perms.html

➞

Show inline comments

@@ @@ -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');
         });
     });
 </script>

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -24,7 +24,6 @@ ${self.repo_context_bar('changelog', c.c @@
   </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>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -323,7 +323,6 @@ ${self.repo_context_bar('showpullrequest @@
     </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 @@ ${self.repo_context_bar('showpullrequest @@
     <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));

0 comments (0 inline, 0 general)