Show More
@@ -21,6 +21,8 b' news' | |||||
21 | post push/pull/create repo hooks callbacks |
|
21 | post push/pull/create repo hooks callbacks | |
22 | - implemented #377 Users view for his own permissions on account page |
|
22 | - implemented #377 Users view for his own permissions on account page | |
23 | - #399 added inheritance of permissions for users group on repos groups |
|
23 | - #399 added inheritance of permissions for users group on repos groups | |
|
24 | - #401 repository group is automatically pre-selected when adding repos | |||
|
25 | inside a repository group | |||
24 |
|
26 | |||
25 | fixes |
|
27 | fixes | |
26 | +++++ |
|
28 | +++++ |
@@ -44,7 +44,7 b' class HomeController(BaseController):' | |||||
44 | def index(self): |
|
44 | def index(self): | |
45 | c.repos_list = self.scm_model.get_repos() |
|
45 | c.repos_list = self.scm_model.get_repos() | |
46 | c.groups = self.scm_model.get_repos_groups() |
|
46 | c.groups = self.scm_model.get_repos_groups() | |
47 |
|
47 | c.group = None | ||
48 | return render('/index.html') |
|
48 | return render('/index.html') | |
49 |
|
49 | |||
50 | def repo_switcher(self): |
|
50 | def repo_switcher(self): |
@@ -29,7 +29,7 b'' | |||||
29 | <label for="repo_group">${_('Repository group')}:</label> |
|
29 | <label for="repo_group">${_('Repository group')}:</label> | |
30 | </div> |
|
30 | </div> | |
31 | <div class="input"> |
|
31 | <div class="input"> | |
32 | ${h.select('repo_group','',c.repo_groups,class_="medium")} |
|
32 | ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} | |
33 | <span class="help-block">${_('Optional select a group to put this repository into.')}</span> |
|
33 | <span class="help-block">${_('Optional select a group to put this repository into.')}</span> | |
34 | </div> |
|
34 | </div> | |
35 | </div> |
|
35 | </div> |
@@ -9,7 +9,11 b'' | |||||
9 | %if h.HasPermissionAny('hg.admin','hg.create.repository')(): |
|
9 | %if h.HasPermissionAny('hg.admin','hg.create.repository')(): | |
10 | <ul class="links"> |
|
10 | <ul class="links"> | |
11 | <li> |
|
11 | <li> | |
|
12 | %if c.group: | |||
|
13 | <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository',parent_group=c.group.group_id))}</span> | |||
|
14 | %else: | |||
12 | <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span> |
|
15 | <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span> | |
|
16 | %endif | |||
13 | </li> |
|
17 | </li> | |
14 | </ul> |
|
18 | </ul> | |
15 | %endif |
|
19 | %endif |
General Comments 0
You need to be logged in to leave comments.
Login now