# HG changeset patch # User Mads Kiilerich # Date 1359576827 -3600 # Node ID 6cdf2cd9d9d8626f32dddf19f803e1008fb7aa65 # Parent 171ec11e94316aba9706859e92fc6f539bba4394 repo edit: it is a repo thing more than an admin thing - show it that way in ui and url diff -r 171ec11e9431 -r 6cdf2cd9d9d8 rhodecode/config/routing.py --- a/rhodecode/config/routing.py Wed Jan 30 20:30:37 2013 +0100 +++ b/rhodecode/config/routing.py Wed Jan 30 21:13:47 2013 +0100 @@ -102,7 +102,8 @@ m.connect("/repos/{repo_name:.*?}", action="delete", conditions=dict(method=["DELETE"], function=check_repo)) - m.connect("edit_repo", "/repos/{repo_name:.*?}/edit", + # no longer used: + m.connect("edit_repo_admin", "/repos/{repo_name:.*?}/edit", action="edit", conditions=dict(method=["GET"], function=check_repo)) m.connect("formatted_edit_repo", "/repos/{repo_name:.*?}.{format}/edit", @@ -434,6 +435,11 @@ controller='changeset', revision='tip', conditions=dict(function=check_repo)) + rmap.connect("edit_repo", "/{repo_name:.*?}/edit", + controller='admin/repos', action="edit", + conditions=dict(method=["GET"], function=check_repo) + ) + #still working url for backward compat. rmap.connect('raw_changeset_home_depraced', '/{repo_name:.*?}/raw-changeset/{revision}', diff -r 171ec11e9431 -r 6cdf2cd9d9d8 rhodecode/controllers/admin/repos.py --- a/rhodecode/controllers/admin/repos.py Wed Jan 30 20:30:37 2013 +0100 +++ b/rhodecode/controllers/admin/repos.py Wed Jan 30 21:13:47 2013 +0100 @@ -38,7 +38,7 @@ from rhodecode.lib import helpers as h from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \ HasPermissionAnyDecorator, HasRepoPermissionAllDecorator -from rhodecode.lib.base import BaseController, render +from rhodecode.lib.base import BaseRepoController, render from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug from rhodecode.lib.helpers import get_token from rhodecode.model.meta import Session @@ -53,7 +53,7 @@ log = logging.getLogger(__name__) -class ReposController(BaseController): +class ReposController(BaseRepoController): """ REST Controller styled on the Atom Publishing Protocol""" # To properly map this controller, ensure your config/routing.py diff -r 171ec11e9431 -r 6cdf2cd9d9d8 rhodecode/templates/admin/repos/repo_edit.html --- a/rhodecode/templates/admin/repos/repo_edit.html Wed Jan 30 20:30:37 2013 +0100 +++ b/rhodecode/templates/admin/repos/repo_edit.html Wed Jan 30 21:13:47 2013 +0100 @@ -6,15 +6,15 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} + ${h.link_to(_(u'Home'),h.url('/'))} » - ${h.link_to(_('Repositories'),h.url('repos'))} + ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » - ${_('edit')} » ${h.link_to(c.repo_info.just_name,h.url('summary_home',repo_name=c.repo_name))} + ${_('edit')} <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('options')} <%def name="main()">