From c8b84eb47fc1c7a352e7299a1ef68eeac57c0635 Mon Sep 17 00:00:00 2001 From: lian Date: Fri, 4 Dec 2015 16:17:14 +0800 Subject: [PATCH] update sys admin repo view & user info test --- seahub/templates/sysadmin/repoadmin_table.html | 2 +- seahub/views/sysadmin.py | 1 + tests/seahub/views/test_sysadmin.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/seahub/templates/sysadmin/repoadmin_table.html b/seahub/templates/sysadmin/repoadmin_table.html index b151bec2f9..0eac76c4be 100644 --- a/seahub/templates/sysadmin/repoadmin_table.html +++ b/seahub/templates/sysadmin/repoadmin_table.html @@ -17,7 +17,7 @@ {% trans {% if repo.is_default_repo %} {{ repo.props.name }} - {% elif enable_sys_admin_view_repo %} + {% elif enable_sys_admin_view_repo and is_pro_version %} {{ repo.props.name }} {% else %} {{ repo.props.name }} diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index 07811ab017..8c849ff39f 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -173,6 +173,7 @@ def sys_repo_admin(request): return render_to_response( 'sysadmin/sys_repo_admin.html', { 'enable_sys_admin_view_repo': ENABLE_SYS_ADMIN_VIEW_REPO, + 'is_pro_version': is_pro_version(), 'repos': repos, 'current_page': current_page, 'prev_page': current_page-1, diff --git a/tests/seahub/views/test_sysadmin.py b/tests/seahub/views/test_sysadmin.py index 0e237f1c77..cbfd7452c7 100644 --- a/tests/seahub/views/test_sysadmin.py +++ b/tests/seahub/views/test_sysadmin.py @@ -231,7 +231,7 @@ class UserInfoTest(BaseTestCase): self.assertContains(resp, 'id="owned"') self.assertContains(resp, 'id="shared"') self.assertContains(resp, 'id="shared-links"') - self.assertContains(resp, 'id="groups"') + self.assertContains(resp, 'id="user-admin-groups"') def test_can_list_owned_repos(self):