mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-03 16:10:26 +00:00
Fixed duplicated function name bug in removing library
This commit is contained in:
2
urls.py
2
urls.py
@@ -52,7 +52,7 @@ urlpatterns = patterns('',
|
|||||||
url(r'^repo/recycle/(?P<repo_id>[^/]+)/$', repo_recycle_view, name='repo_recycle_view'),
|
url(r'^repo/recycle/(?P<repo_id>[^/]+)/$', repo_recycle_view, name='repo_recycle_view'),
|
||||||
url(r'^repo/snapshot/view/(?P<repo_id>[^/]+)/$', repo_view_snapshot, name='repo_view_snapshot'),
|
url(r'^repo/snapshot/view/(?P<repo_id>[^/]+)/$', repo_view_snapshot, name='repo_view_snapshot'),
|
||||||
(r'^repo/history/changes/(?P<repo_id>[^/]+)/$', repo_history_changes),
|
(r'^repo/history/changes/(?P<repo_id>[^/]+)/$', repo_history_changes),
|
||||||
(r'^repo/remove/(?P<repo_id>[^/]+)/$', remove_repo),
|
(r'^repo/remove/(?P<repo_id>[^/]+)/$', repo_remove),
|
||||||
url(r'^repo/(?P<repo_id>[^/]+)/files/$', repo_view_file, name="repo_view_file"),
|
url(r'^repo/(?P<repo_id>[^/]+)/files/$', repo_view_file, name="repo_view_file"),
|
||||||
(r'^repo/(?P<repo_id>[^/]+)/file/edit/$', repo_file_edit),
|
(r'^repo/(?P<repo_id>[^/]+)/file/edit/$', repo_file_edit),
|
||||||
url(r'^repo/(?P<repo_id>[^/]+)/(?P<obj_id>[^/]+)/$', repo_access_file, name='repo_access_file'),
|
url(r'^repo/(?P<repo_id>[^/]+)/(?P<obj_id>[^/]+)/$', repo_access_file, name='repo_access_file'),
|
||||||
|
2
views.py
2
views.py
@@ -781,7 +781,7 @@ def modify_token(request, repo_id):
|
|||||||
return HttpResponseRedirect(reverse('repo', args=[repo_id]))
|
return HttpResponseRedirect(reverse('repo', args=[repo_id]))
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def remove_repo(request, repo_id):
|
def repo_remove(request, repo_id):
|
||||||
repo = get_repo(repo_id)
|
repo = get_repo(repo_id)
|
||||||
if not repo:
|
if not repo:
|
||||||
return render_error(request, _(u'Library not exists'))
|
return render_error(request, _(u'Library not exists'))
|
||||||
|
Reference in New Issue
Block a user