kallithea Changeset - 100be6988bb0

Changeset - 100be6988bb0

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 12 years ago 2013-05-17 21:33:24
marcin@python-works.com

show admin menu and list for users who are admins of repos.

- this is consistent with user groups, repo groups displaying.
- fixes 403s after you actually delete a repository being it's admin

3 files changed with 13 insertions and 10 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/lib/auth.py

rhodecode/templates/base/base.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -133,15 +133,14 @@ class ReposController(BaseRepoController @@
         defaults['id_fork_of'] = db_repo.fork.repo_id if db_repo.fork else ''
         return defaults
     @HasPermissionAllDecorator('hg.admin')
     def index(self, format='html'):
         """GET /repos: All items in the collection"""
         # url('repos')
         repo_list = Repository.query()\
                                 .order_by(func.lower(Repository.repo_name))\
                                 .all()
         c.repos_list = Repository.query()\
                         .order_by(func.lower(Repository.repo_name))\
                         .all()
         c.repos_list = RepoList(repo_list, perm_set=['repository.admin'])
         repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
                                                    admin=True,
                                                    super_user_actions=True)

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -403,7 +403,7 @@ class AuthUser(object): @@
         return self.admin
     @property
-    def repos_admin(self):
+    def repositories_admin(self):
         """
         Returns list of repositories you're an admin of
         """

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -77,11 +77,14 @@ @@
   </ul>
 </%def>
 <%def name="admin_menu_simple(repository_groups=None, user_groups=None)">
+<%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
   <ul>
    %if repositories:
       <li>${h.link_to(_('Repositories'),h.url('repos'),class_='repos')}</li>
    %endif
    %if repository_groups:
       <li>${h.link_to(_('Repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
-   %endif:
    %endif
    %if user_groups:
       <li>${h.link_to(_('User groups'),h.url('users_groups'),class_='groups')}</li>
    %endif
@@ @@ -311,12 +314,13 @@ @@
               </a>
               ${admin_menu()}
             </li>
           % elif c.rhodecode_user.repository_groups_admin or c.rhodecode_user.user_groups_admin:
+          % elif c.rhodecode_user.repositories_admin or c.rhodecode_user.repository_groups_admin or c.rhodecode_user.user_groups_admin:
           <li ${is_current('admin')}>
               <a class="menu_link admin childs" title="${_('Admin')}">
                 ${_('Admin')}
               </a>
               ${admin_menu_simple(c.rhodecode_user.repository_groups_admin,
               ${admin_menu_simple(c.rhodecode_user.repositories_admin,
                                   c.rhodecode_user.repository_groups_admin,
                                   c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
           </li>
           % endif

0 comments (0 inline, 0 general)