diff --git a/seahub/urls.py b/seahub/urls.py index e908fb6d38..dbfd26dab3 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -306,20 +306,20 @@ if getattr(settings, 'ENABLE_SYSADMIN_EXTRA', False): sys_log_file_update_export_excel, sys_log_perm_audit_export_excel, \ sys_log_email_audit urlpatterns += patterns('', - url(r'^api/v2.1/admin/login/$', Login.as_view(), name='api-v2.1-admin-login'), + url(r'^api/v2.1/admin/logs/login/$', Login.as_view(), name='api-v2.1-admin-logs-login'), url(r'^sys/loginadmin/$', sys_login_admin, name='sys_login_admin'), url(r'^sys/loginadmin/export-excel/$', sys_login_admin_export_excel, name='sys_login_admin_export_excel'), - url(r'^api/v2.1/admin/file-audit/$', FileAudit.as_view(), name='api-v2.1-admin-file-audit'), + url(r'^api/v2.1/admin/logs/file-audit/$', FileAudit.as_view(), name='api-v2.1-admin-logs-file-audit'), url(r'^sys/log/fileaudit/$', sys_log_file_audit, name='sys_log_file_audit'), url(r'^sys/log/emailaudit/$', sys_log_email_audit, name='sys_log_email_audit'), url(r'^sys/log/fileaudit/export-excel/$', sys_log_file_audit_export_excel, name='sys_log_file_audit_export_excel'), - url(r'^api/v2.1/admin/file-update/$', FileUpdate.as_view(), name='api-v2.1-admin-file-update'), + url(r'^api/v2.1/admin/logs/file-update/$', FileUpdate.as_view(), name='api-v2.1-admin-logs-file-update'), url(r'^sys/log/fileupdate/$', sys_log_file_update, name='sys_log_file_update'), url(r'^sys/log/fileupdate/export-excel/$', sys_log_file_update_export_excel, name='sys_log_file_update_export_excel'), - url(r'^api/v2.1/admin/perm-audit/$', PermAudit.as_view(), name='api-v2.1-admin-perm-audit'), + url(r'^api/v2.1/admin/logs/perm-audit/$', PermAudit.as_view(), name='api-v2.1-admin-logs-perm-audit'), url(r'^sys/log/permaudit/$', sys_log_perm_audit, name='sys_log_perm_audit'), url(r'^sys/log/permaudit/export-excel/$', sys_log_perm_audit_export_excel, name='sys_log_perm_audit_export_excel'), ) diff --git a/tests/api/endpoints/admin/test_file_audit_log.py b/tests/api/endpoints/admin/test_file_audit_log.py index 37e13f4d8e..0a424be979 100644 --- a/tests/api/endpoints/admin/test_file_audit_log.py +++ b/tests/api/endpoints/admin/test_file_audit_log.py @@ -28,7 +28,7 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?star=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-file-audit') + para_str + url = reverse('api-v2.1-admin-logs-file-audit') + para_str resp = self.client.get(url) self.assertEqual(400, resp.status_code) @@ -48,7 +48,7 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&en=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-file-audit') + para_str + url = reverse('api-v2.1-admin-logs-file-audit') + para_str resp = self.client.get(url) self.assertEqual(400, resp.status_code) @@ -65,6 +65,6 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-file-audit') + para_str + url = reverse('api-v2.1-admin-logs-file-audit') + para_str resp = self.client.get(url) self.assertEqual(403, resp.status_code) diff --git a/tests/api/endpoints/admin/test_file_update_log.py b/tests/api/endpoints/admin/test_file_update_log.py index fe1d0e8f53..002910566d 100644 --- a/tests/api/endpoints/admin/test_file_update_log.py +++ b/tests/api/endpoints/admin/test_file_update_log.py @@ -28,7 +28,7 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?star=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-file-update') + para_str + url = reverse('api-v2.1-admin-logs-file-update') + para_str resp = self.client.get(url) self.assertEqual(400, resp.status_code) @@ -48,7 +48,7 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&en=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-file-update') + para_str + url = reverse('api-v2.1-admin-logs-file-update') + para_str resp = self.client.get(url) self.assertEqual(400, resp.status_code) @@ -65,6 +65,6 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-file-update') + para_str + url = reverse('api-v2.1-admin-logs-file-update') + para_str resp = self.client.get(url) self.assertEqual(403, resp.status_code) diff --git a/tests/api/endpoints/admin/test_login_log.py b/tests/api/endpoints/admin/test_login_log.py index dcb56c1375..cc6ebbfe36 100644 --- a/tests/api/endpoints/admin/test_login_log.py +++ b/tests/api/endpoints/admin/test_login_log.py @@ -25,7 +25,7 @@ class LoginLogTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-login') + para_str + url = reverse('api-v2.1-admin-logs-login') + para_str resp = self.client.get(url) json_resp = json.loads(resp.content) @@ -44,7 +44,7 @@ class LoginLogTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?star=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-login') + para_str + url = reverse('api-v2.1-admin-logs-login') + para_str resp = self.client.get(url) self.assertEqual(400, resp.status_code) @@ -61,7 +61,7 @@ class LoginLogTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&en=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-login') + para_str + url = reverse('api-v2.1-admin-logs-login') + para_str resp = self.client.get(url) self.assertEqual(400, resp.status_code) @@ -78,6 +78,6 @@ class LoginLogTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-login') + para_str + url = reverse('api-v2.1-admin-logs-login') + para_str resp = self.client.get(url) self.assertEqual(403, resp.status_code) diff --git a/tests/api/endpoints/admin/test_perm_audit_log.py b/tests/api/endpoints/admin/test_perm_audit_log.py index f6fac23020..1b41769ab8 100644 --- a/tests/api/endpoints/admin/test_perm_audit_log.py +++ b/tests/api/endpoints/admin/test_perm_audit_log.py @@ -28,7 +28,7 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?star=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-perm-audit') + para_str + url = reverse('api-v2.1-admin-logs-perm-audit') + para_str resp = self.client.get(url) self.assertEqual(400, resp.status_code) @@ -48,7 +48,7 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&en=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-perm-audit') + para_str + url = reverse('api-v2.1-admin-logs-perm-audit') + para_str resp = self.client.get(url) self.assertEqual(400, resp.status_code) @@ -65,6 +65,6 @@ class AccountTest(BaseTestCase): end_time_str = datetime.datetime.fromtimestamp(end_timestamp).strftime('%Y-%m-%d') para_str = '?start=%s&end=%s' % (start_time_str, end_time_str) - url = reverse('api-v2.1-admin-perm-audit') + para_str + url = reverse('api-v2.1-admin-logs-perm-audit') + para_str resp = self.client.get(url) self.assertEqual(403, resp.status_code)