haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-02 07:47:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1127 from haiwen/update-admin-log-api

Browse Source 
update url of admin log api
This commit is contained in:
Daniel Pan 2016-04-14 17:54:31 +08:00
commit 5460730ed9
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
seahub/urls.py
View File

@ -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'),
)

6
tests/api/endpoints/admin/test_file_audit_log.py
View File

@ -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)

6
tests/api/endpoints/admin/test_file_update_log.py
View File

@ -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)

8
tests/api/endpoints/admin/test_login_log.py
View File

@ -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)

6
tests/api/endpoints/admin/test_perm_audit_log.py
View File

@ -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)