haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 21:07:17 +00:00
Code Issues Releases Wiki Activity

Use email in profile url, and clean code

Browse Source
This commit is contained in:
zhengxie
2015-06-27 14:12:46 +08:00
parent dfec4103b5
commit 5e9a8a98ce
25 changed files with 121 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
seahub/urls.py
View File

@@ -13,8 +13,8 @@ from seahub.views.repo import repo, repo_history_view, view_shared_dir, \
from notifications.views import notification_list
from group.views import group_list
from message.views import user_msg_list, user_msg_remove, user_received_msg_remove
from share.views import user_share_list, gen_private_file_share, \
rm_private_file_share, save_private_file_share
from share.views import gen_private_file_share, rm_private_file_share, \
save_private_file_share
from seahub.views.wiki import personal_wiki, personal_wiki_pages, \
personal_wiki_create, personal_wiki_page_new, personal_wiki_page_edit, \
personal_wiki_page_delete, personal_wiki_use_lib
@@ -119,7 +119,7 @@ urlpatterns = patterns('',
url(r'^user/(?P<id_or_email>[^/]+)/msgs/$', user_msg_list, name='user_msg_list'),
url(r'^user/(?P<msg_id>\d+)/msgdel/$', user_msg_remove, name='user_msg_remove'),
url(r'^user/(?P<msg_id>\d+)/remsgdel/$', user_received_msg_remove, name='user_received_msg_remove'),
url(r'^user/(?P<id_or_email>[^/]+)/shares/$', user_share_list, name='user_share_list'),
# url(r'^user/(?P<id_or_email>[^/]+)/shares/$', user_share_list, name='user_share_list'),
url(r'^modules/toggle/$', toggle_modules, name="toggle_modules"),
url(r'^download_client_program/$', TemplateView.as_view(template_name="download.html"), name="download_client"),
url(r'^choose_register/$', TemplateView.as_view(template_name="choose_register.html"), name="choose_register"),
@@ -234,11 +234,11 @@ urlpatterns = patterns('',
url(r'^useradmin/remove/(?P<email>[^/]+)/$', user_remove, name="user_remove"),
url(r'^useradmin/removetrial/(?P<user_or_org>[^/]+)/$', remove_trial, name="remove_trial"),
url(r'^useradmin/search/$', user_search, name="user_search"),
url(r'^useradmin/makeadmin/(?P<user_id>[^/]+)/$', user_make_admin, name='user_make_admin'),
# url(r'^useradmin/makeadmin/(?P<user_id>[^/]+)/$', user_make_admin, name='user_make_admin'),
url(r'^useradmin/removeadmin/(?P<email>[^/]+)/$', user_remove_admin, name='user_remove_admin'),
url(r'^useradmin/info/(?P<email>[^/]+)/$', user_info, name='user_info'),
url(r'^useradmin/activate/(?P<user_id>[^/]+)/$', user_activate, name='user_activate'),
url(r'^useradmin/deactivate/(?P<user_id>[^/]+)/$', user_deactivate, name='user_deactivate'),
# url(r'^useradmin/activate/(?P<user_id>[^/]+)/$', user_activate, name='user_activate'),
# url(r'^useradmin/deactivate/(?P<user_id>[^/]+)/$', user_deactivate, name='user_deactivate'),
url(r'^useradmin/toggle_status/(?P<email>[^/]+)/$', user_toggle_status, name='user_toggle_status'),
url(r'^useradmin/toggle_role/(?P<email>[^/]+)/$', user_toggle_role, name='user_toggle_role'),
url(r'^useradmin/(?P<email>[^/]+)/set_quota/$', user_set_quota, name='user_set_quota'),