kallithea Changeset - af938280e76a

Changeset - af938280e76a

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 8 years ago 2018-04-23 00:44:13
mads@kiilerich.com

repos: document get_repos_as_dict parameters - repos_list is mandatory

6 files changed with 13 insertions and 10 deletions:

kallithea/controllers/admin/my_account.py

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/admin/repos.py

kallithea/controllers/home.py

kallithea/controllers/journal.py

kallithea/model/repo.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/my_account.py

➞

Show inline comments

@@ @@ -79,14 +79,13 @@ class MyAccountController(BaseController @@
         else:
             admin = True
             repos_list = Session().query(Repository) \
                          .filter(Repository.owner_id ==
                                  request.authuser.user_id).all()
         return RepoModel().get_repos_as_dict(repos_list=repos_list,
                                                    admin=admin)
         return RepoModel().get_repos_as_dict(repos_list, admin=admin)
     def my_account(self):
         c.active = 'profile'
         self.__load_data()
         c.perm_user = AuthUser(user_id=request.authuser.user_id)
         managed_fields = auth_modules.get_managed_fields(c.user)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -292,15 +292,15 @@ class RepoGroupsController(BaseControlle @@
         c.group = c.repo_group = RepoGroup.guess_instance(group_name)
         groups = RepoGroup.query(sorted=True).filter_by(parent_group=c.group).all()
         repo_groups_list = self.scm_model.get_repo_groups(groups)
         repos_list = Repository.query(sorted=True).filter_by(group=c.group).all()
-        c.data = RepoModel().get_repos_as_dict(repos_list=repos_list,
         c.data = RepoModel().get_repos_as_dict(repos_list,
                                                repo_groups_list=repo_groups_list,
-                                               admin=False, short_name=True)
                                                short_name=True)
         return render('admin/repo_groups/repo_group_show.html')
     @HasRepoGroupPermissionLevelDecorator('admin')
     def edit(self, group_name):
         c.active = 'settings'

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -99,13 +99,13 @@ class ReposController(BaseRepoController @@
     def index(self, format='html'):
         _list = Repository.query(sorted=True).all()
         c.repos_list = RepoList(_list, perm_level='admin')
         # the repo list will be filtered to only show repos where the user has read permissions
-        repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list, admin=True)
         repos_data = RepoModel().get_repos_as_dict(c.repos_list, admin=True)
         # data used to render the grid
         c.data = repos_data
         return render('admin/repos/repos.html')
     @NotAnonymous()

kallithea/controllers/home.py

➞

Show inline comments

@@ @@ -54,15 +54,15 @@ class HomeController(BaseController): @@
     def index(self):
         c.group = None
         repo_groups_list = self.scm_model.get_repo_groups()
         repos_list = Repository.query(sorted=True).filter_by(group=None).all()
-        c.data = RepoModel().get_repos_as_dict(repos_list=repos_list,
         c.data = RepoModel().get_repos_as_dict(repos_list,
                                                repo_groups_list=repo_groups_list,
-                                               admin=False, short_name=True)
                                                short_name=True)
         return render('/index.html')
     @LoginRequired(allow_default_user=True)
     @jsonify
     def repo_switcher_data(self):

kallithea/controllers/journal.py

➞

Show inline comments

@@ @@ -211,14 +211,13 @@ class JournalController(BaseController): @@
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return render('journal/journal_data.html')
         repos_list = Repository.query(sorted=True) \
             .filter_by(owner_id=request.authuser.user_id).all()
         repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list,
                                                    admin=True)
         repos_data = RepoModel().get_repos_as_dict(repos_list, admin=True)
         # data used to render the grid
         c.data = repos_data
         return render('journal/journal.html')
     @LoginRequired(api_access=True)

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -146,15 +146,20 @@ class RepoModel(object): @@
         template = _tmpl_lookup.get_template('data_table/_dt_elements.html')
         tmpl = template.get_def(tmpl)
         kwargs.update(dict(_=_, h=h, c=c, request=request))
         return tmpl.render(*args, **kwargs)
-    def get_repos_as_dict(self, repos_list=None, repo_groups_list=None,
     def get_repos_as_dict(self, repos_list, repo_groups_list=None,
                           admin=False,
                           short_name=False):
         """Return repository list for use by DataTable.
         repos_list: list of repositories - but will be filtered for read permission.
         repo_groups_list: added at top of list without permission check.
         admin: return data for action column.
         """
         _render = self._render_datatable
         from tg import tmpl_context as c
         def repo_lnk(name, rtype, rstate, private, fork_of):
             return _render('repo_name', name, rtype, rstate, private, fork_of,
                            short_name=short_name)

0 comments (0 inline, 0 general)