diff --git a/seahub/urls.py b/seahub/urls.py index 017aec03fc..bac58034dc 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -58,11 +58,14 @@ urlpatterns = patterns( # url(r'^home/public/reply/(?P[\d]+)/$', innerpub_msg_reply, name='innerpub_msg_reply'), # url(r'^home/owner/(?P[^/]+)/$', ownerhome, name='ownerhome'), + # revert file/dir/repo + url(r'^repo/revert_file/(?P[-0-9a-f]{36})/$', repo_revert_file, name='repo_revert_file'), + url(r'^repo/revert_dir/(?P[-0-9a-f]{36})/$', repo_revert_dir, name='repo_revert_dir'), + url(r'^repo/history/revert/(?P[-0-9a-f]{36})/$', repo_history_revert, name='repo_revert_history'), + (r'^repo/upload_check/$', validate_filename), url(r'^repo/unsetinnerpub/(?P[-0-9a-f]{36})/$', unsetinnerpub, name='unsetinnerpub'), url(r'^repo/set_password/$', repo_set_password, name="repo_set_password"), - url(r'^repo/revert_file/(?P[-0-9a-f]{36})/$', repo_revert_file, name='repo_revert_file'), - url(r'^repo/revert_dir/(?P[-0-9a-f]{36})/$', repo_revert_dir, name='repo_revert_dir'), url(r'^repo/download_dir/(?P[-0-9a-f]{36})/$', repo_download_dir, name='repo_download_dir'), (r'^repo/upload_error/(?P[-0-9a-f]{36})/$', upload_file_error), (r'^repo/update_error/(?P[-0-9a-f]{36})/$', update_file_error), @@ -70,7 +73,6 @@ urlpatterns = patterns( url(r'^repo/text_diff/(?P[-0-9a-f]{36})/$', text_diff, name='text_diff'), url(r'^repo/(?P[-0-9a-f]{36})/$', repo, name='repo'), url(r'^repo/history/(?P[-0-9a-f]{36})/$', repo_history, name='repo_history'), - (r'^repo/history/revert/(?P[-0-9a-f]{36})/$', repo_history_revert), url(r'^repo/history/view/(?P[-0-9a-f]{36})/$', repo_history_view, name='repo_history_view'), url(r'^repo/recycle/(?P[-0-9a-f]{36})/$', repo_recycle_view, name='repo_recycle_view'), url(r'^repo/(?P[-0-9a-f]{36})/online_gc/$', repo_online_gc, name='repo_online_gc'), @@ -81,7 +83,6 @@ urlpatterns = patterns( url(r'^repo/(?P[-0-9a-f]{36})/trash/files/$', view_trash_file, name="view_trash_file"), url(r'^repo/(?P[-0-9a-f]{36})/snapshot/files/$', view_snapshot_file, name="view_snapshot_file"), url(r'^repo/(?P[-0-9a-f]{36})/file/edit/$', file_edit, name='file_edit'), - url(r'^repo/(?P[-0-9a-f]{36})/privshare/$', gen_private_file_share, name='gen_private_file_share'), url(r'^repo/(?P[-0-9a-f]{36})/(?P[0-9a-f]{40})/download/$', download_file, name='download_file'), url(r'^repo/(?P[-0-9a-f]{36})/settings/$', repo_basic_info, name='repo_basic_info'), url(r'^repo/(?P[-0-9a-f]{36})/settings/transfer-owner/$', repo_transfer_owner, name='repo_transfer_owner'), @@ -99,9 +100,10 @@ urlpatterns = patterns( # url(r'^home/my/lib/(?P[-0-9a-f]{36})/dir/(?P.*)$', myhome_lib, name='myhome_lib'), ### share file/dir, upload link ### - url(r'^s/f/(?P[a-f0-9]{10})/$', view_priv_shared_file, name="view_priv_shared_file"), - url(r'^s/f/(?P[a-f0-9]{10})/rm/$', rm_private_file_share, name="rm_private_file_share"), - url(r'^s/f/(?P[a-f0-9]{10})/save/$', save_private_file_share, name='save_private_file_share'), +# url(r'^repo/(?P[-0-9a-f]{36})/privshare/$', gen_private_file_share, name='gen_private_file_share'), +# url(r'^s/f/(?P[a-f0-9]{10})/$', view_priv_shared_file, name="view_priv_shared_file"), +# url(r'^s/f/(?P[a-f0-9]{10})/rm/$', rm_private_file_share, name="rm_private_file_share"), +# url(r'^s/f/(?P[a-f0-9]{10})/save/$', save_private_file_share, name='save_private_file_share'), url(r'^f/(?P[a-f0-9]{10})/$', view_shared_file, name='view_shared_file'), url(r'^f/(?P[a-f0-9]{10})/raw/(?P[0-9a-f]{40})/(?P.*)', view_raw_shared_file, name='view_raw_shared_file'), url(r'^d/(?P[a-f0-9]{10})/$', view_shared_dir, name='view_shared_dir'), diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index 559336cc70..ef32738467 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -622,7 +622,7 @@ def repo_basic_info(request, repo_id): @login_required def repo_transfer_owner(request, repo_id): - """Transfer repo owner. + """Show transfer repo owner page. """ username = request.user.username can_access, repo = can_access_repo_setting(request, repo_id, username) @@ -647,7 +647,7 @@ def repo_transfer_success(request, repo_id): @login_required def repo_change_password(request, repo_id): - """Change library password. + """Show change library password page. """ username = request.user.username can_access, repo = can_access_repo_setting(request, repo_id, username)