##// END OF EJS Templates
repo edit: it is a repo thing more than an admin thing - show it that way in ui and url
Mads Kiilerich -
r3288:6cdf2cd9 beta
parent child Browse files
Show More
@@ -102,7 +102,8 b' def make_map(config):'
102 m.connect("/repos/{repo_name:.*?}",
102 m.connect("/repos/{repo_name:.*?}",
103 action="delete", conditions=dict(method=["DELETE"],
103 action="delete", conditions=dict(method=["DELETE"],
104 function=check_repo))
104 function=check_repo))
105 m.connect("edit_repo", "/repos/{repo_name:.*?}/edit",
105 # no longer used:
106 m.connect("edit_repo_admin", "/repos/{repo_name:.*?}/edit",
106 action="edit", conditions=dict(method=["GET"],
107 action="edit", conditions=dict(method=["GET"],
107 function=check_repo))
108 function=check_repo))
108 m.connect("formatted_edit_repo", "/repos/{repo_name:.*?}.{format}/edit",
109 m.connect("formatted_edit_repo", "/repos/{repo_name:.*?}.{format}/edit",
@@ -434,6 +435,11 b' def make_map(config):'
434 controller='changeset', revision='tip',
435 controller='changeset', revision='tip',
435 conditions=dict(function=check_repo))
436 conditions=dict(function=check_repo))
436
437
438 rmap.connect("edit_repo", "/{repo_name:.*?}/edit",
439 controller='admin/repos', action="edit",
440 conditions=dict(method=["GET"], function=check_repo)
441 )
442
437 #still working url for backward compat.
443 #still working url for backward compat.
438 rmap.connect('raw_changeset_home_depraced',
444 rmap.connect('raw_changeset_home_depraced',
439 '/{repo_name:.*?}/raw-changeset/{revision}',
445 '/{repo_name:.*?}/raw-changeset/{revision}',
@@ -38,7 +38,7 b' import rhodecode'
38 from rhodecode.lib import helpers as h
38 from rhodecode.lib import helpers as h
39 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
39 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
40 HasPermissionAnyDecorator, HasRepoPermissionAllDecorator
40 HasPermissionAnyDecorator, HasRepoPermissionAllDecorator
41 from rhodecode.lib.base import BaseController, render
41 from rhodecode.lib.base import BaseRepoController, render
42 from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
42 from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
43 from rhodecode.lib.helpers import get_token
43 from rhodecode.lib.helpers import get_token
44 from rhodecode.model.meta import Session
44 from rhodecode.model.meta import Session
@@ -53,7 +53,7 b' from sqlalchemy.sql.expression import fu'
53 log = logging.getLogger(__name__)
53 log = logging.getLogger(__name__)
54
54
55
55
56 class ReposController(BaseController):
56 class ReposController(BaseRepoController):
57 """
57 """
58 REST Controller styled on the Atom Publishing Protocol"""
58 REST Controller styled on the Atom Publishing Protocol"""
59 # To properly map this controller, ensure your config/routing.py
59 # To properly map this controller, ensure your config/routing.py
@@ -6,15 +6,15 b''
6 </%def>
6 </%def>
7
7
8 <%def name="breadcrumbs_links()">
8 <%def name="breadcrumbs_links()">
9 ${h.link_to(_('Admin'),h.url('admin_home'))}
9 ${h.link_to(_(u'Home'),h.url('/'))}
10 &raquo;
10 &raquo;
11 ${h.link_to(_('Repositories'),h.url('repos'))}
11 ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
12 &raquo;
12 &raquo;
13 ${_('edit')} &raquo; ${h.link_to(c.repo_info.just_name,h.url('summary_home',repo_name=c.repo_name))}
13 ${_('edit')}
14 </%def>
14 </%def>
15
15
16 <%def name="page_nav()">
16 <%def name="page_nav()">
17 ${self.menu('admin')}
17 ${self.menu('options')}
18 </%def>
18 </%def>
19
19
20 <%def name="main()">
20 <%def name="main()">
General Comments 0
You need to be logged in to leave comments. Login now