mirror of
https://github.com/haiwen/seahub.git
synced 2025-08-11 03:42:16 +00:00
Merge pull request #955 from haiwen/view_repo_file
[clean code] remove view_repo_file function
This commit is contained in:
commit
79c0628826
@ -4,7 +4,7 @@ from django.conf import settings
|
|||||||
from django.views.generic import TemplateView
|
from django.views.generic import TemplateView
|
||||||
|
|
||||||
from seahub.views import *
|
from seahub.views import *
|
||||||
from seahub.views.file import view_repo_file, view_history_file, view_trash_file,\
|
from seahub.views.file import view_history_file, view_trash_file,\
|
||||||
view_snapshot_file, file_edit, view_shared_file, view_file_via_shared_dir,\
|
view_snapshot_file, file_edit, view_shared_file, view_file_via_shared_dir,\
|
||||||
text_diff, view_priv_shared_file, view_raw_file, view_raw_shared_file, \
|
text_diff, view_priv_shared_file, view_raw_file, view_raw_shared_file, \
|
||||||
download_file, view_lib_file, file_access
|
download_file, view_lib_file, file_access
|
||||||
@ -78,7 +78,6 @@ urlpatterns = patterns(
|
|||||||
url(r'^repo/recycle/(?P<repo_id>[-0-9a-f]{36})/$', repo_recycle_view, name='repo_recycle_view'),
|
url(r'^repo/recycle/(?P<repo_id>[-0-9a-f]{36})/$', repo_recycle_view, name='repo_recycle_view'),
|
||||||
url(r'^dir/recycle/(?P<repo_id>[-0-9a-f]{36})/$', dir_recycle_view, name='dir_recycle_view'),
|
url(r'^dir/recycle/(?P<repo_id>[-0-9a-f]{36})/$', dir_recycle_view, name='dir_recycle_view'),
|
||||||
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/online_gc/$', repo_online_gc, name='repo_online_gc'),
|
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/online_gc/$', repo_online_gc, name='repo_online_gc'),
|
||||||
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/files/$', view_repo_file, name="repo_view_file"),
|
|
||||||
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/raw/(?P<file_path>.*)$', view_raw_file, name="view_raw_file"),
|
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/raw/(?P<file_path>.*)$', view_raw_file, name="view_raw_file"),
|
||||||
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/history/files/$', view_history_file, name="view_history_file"),
|
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/history/files/$', view_history_file, name="view_history_file"),
|
||||||
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/trash/files/$', view_trash_file, name="view_trash_file"),
|
url(r'^repo/(?P<repo_id>[-0-9a-f]{36})/trash/files/$', view_trash_file, name="view_trash_file"),
|
||||||
|
@ -345,15 +345,6 @@ def send_file_access_msg_when_preview(request, repo, path, access_from):
|
|||||||
if filetype == PDF and USE_PDFJS:
|
if filetype == PDF and USE_PDFJS:
|
||||||
send_file_access_msg(request, repo, path, access_from)
|
send_file_access_msg(request, repo, path, access_from)
|
||||||
|
|
||||||
@login_required
|
|
||||||
@repo_passwd_set_required
|
|
||||||
def view_repo_file(request, repo_id):
|
|
||||||
"""
|
|
||||||
Old 'file view' that put path in parameter
|
|
||||||
"""
|
|
||||||
path = request.GET.get('p', '/').rstrip('/')
|
|
||||||
return _file_view(request, repo_id, path)
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@repo_passwd_set_required
|
@repo_passwd_set_required
|
||||||
def view_lib_file(request, repo_id, path):
|
def view_lib_file(request, repo_id, path):
|
||||||
|
Loading…
Reference in New Issue
Block a user