Mercurial > kallithea
changeset 2130:5242b1619603 beta
#401 repository group is automatically pre-selected when adding repos inside a repository group
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 16 Mar 2012 13:21:17 +0200 |
parents | 43481c3d70ca |
children | d683d8bc4be3 |
files | docs/changelog.rst rhodecode/controllers/home.py rhodecode/templates/admin/repos/repo_add_base.html rhodecode/templates/index_base.html |
diffstat | 4 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Wed Mar 14 18:51:00 2012 +0200 +++ b/docs/changelog.rst Fri Mar 16 13:21:17 2012 +0200 @@ -21,6 +21,8 @@ post push/pull/create repo hooks callbacks - implemented #377 Users view for his own permissions on account page - #399 added inheritance of permissions for users group on repos groups +- #401 repository group is automatically pre-selected when adding repos + inside a repository group fixes +++++
--- a/rhodecode/controllers/home.py Wed Mar 14 18:51:00 2012 +0200 +++ b/rhodecode/controllers/home.py Fri Mar 16 13:21:17 2012 +0200 @@ -44,7 +44,7 @@ def index(self): c.repos_list = self.scm_model.get_repos() c.groups = self.scm_model.get_repos_groups() - + c.group = None return render('/index.html') def repo_switcher(self):
--- a/rhodecode/templates/admin/repos/repo_add_base.html Wed Mar 14 18:51:00 2012 +0200 +++ b/rhodecode/templates/admin/repos/repo_add_base.html Fri Mar 16 13:21:17 2012 +0200 @@ -29,7 +29,7 @@ <label for="repo_group">${_('Repository group')}:</label> </div> <div class="input"> - ${h.select('repo_group','',c.repo_groups,class_="medium")} + ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} <span class="help-block">${_('Optional select a group to put this repository into.')}</span> </div> </div>
--- a/rhodecode/templates/index_base.html Wed Mar 14 18:51:00 2012 +0200 +++ b/rhodecode/templates/index_base.html Fri Mar 16 13:21:17 2012 +0200 @@ -9,7 +9,11 @@ %if h.HasPermissionAny('hg.admin','hg.create.repository')(): <ul class="links"> <li> + %if c.group: + <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository',parent_group=c.group.group_id))}</span> + %else: <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span> + %endif </li> </ul> %endif