diff --git a/seahub/urls.py b/seahub/urls.py index a0f9454cc1..430f94f51a 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -152,7 +152,6 @@ urlpatterns = patterns( url(r'^ajax/repo/(?P[-0-9a-f]{36})/get-file-uploaded-bytes/$', get_file_uploaded_bytes, name='get_file_uploaded_bytes'), url(r'^ajax/u/d/(?P[-0-9a-f]{10})/upload/$', get_file_upload_url_ul, name='get_file_upload_url_ul'), url(r'^ajax/group/(?P\d+)/repos/$', get_unenc_group_repos, name='get_group_repos'), - url(r'^ajax/group/(?P\d+)/toggle-modules/$', toggle_group_modules, name='toggle_group_modules'), url(r'^ajax/group/(?P\d+)/members/import/$', ajax_group_members_import, name='ajax_group_members_import'), url(r'^ajax/unenc-rw-repos/$', unenc_rw_repos, name='unenc_rw_repos'), url(r'^ajax/upload-file-done/$', upload_file_done, name='upload_file_done'), diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index 3f34f4ca46..ddd2ad806d 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -35,9 +35,6 @@ from seahub.signals import upload_file_successful from seahub.views import get_unencry_rw_repos_by_user, is_registered_user, \ get_system_default_repo_id, get_diff, \ check_folder_permission -from seahub.views.modules import enable_mod_for_group, \ - disable_mod_for_group, MOD_GROUP_WIKI -from seahub.group.views import is_group_staff from seahub.group.utils import is_group_member, is_group_admin_or_owner, \ get_group_member_info import seahub.settings as settings @@ -1899,35 +1896,6 @@ def add_group_folder_perm(request, repo_id, group_ids, path, perm): data = json.dumps({"error": _("Failed")}) return HttpResponse(data, status=400, content_type=content_type) - -@login_required_ajax -def toggle_group_modules(request, group_id): - - content_type = 'application/json; charset=utf-8' - result = {} - - group_id_int = int(group_id) # Checked by URL Conf - group = get_group(group_id_int) - if not group: - result["error"] = _('Group does not exist.') - return HttpResponse(json.dumps(result), - status=400, content_type=content_type) - - group.is_staff = is_group_staff(group, request.user) - if not group.is_staff: - result["error"] = _('Permission denied.') - return HttpResponse(json.dumps(result), - status=403, content_type=content_type) - - group_wiki = request.POST.get('group_wiki', '') - if group_wiki == 'true': - enable_mod_for_group(group.id, MOD_GROUP_WIKI) - else: - disable_mod_for_group(group.id, MOD_GROUP_WIKI) - - return HttpResponse(json.dumps({ "success": True }), - content_type=content_type) - @login_required_ajax def ajax_group_members_import(request, group_id): """Import users to group. diff --git a/static/scripts/common.js b/static/scripts/common.js index a7b84fd2e2..110b5e4daf 100644 --- a/static/scripts/common.js +++ b/static/scripts/common.js @@ -149,7 +149,6 @@ define([ case 'group_member_bulk': return siteRoot + 'api/v2.1/groups/' + options.group_id + '/members/bulk/'; case 'group_import_members': return siteRoot + 'ajax/group/' + options.group_id + '/members/import/'; case 'group_repos': return siteRoot + 'api2/groups/' + options.group_id + '/repos/'; - case 'toggle_group_modules': return siteRoot + 'ajax/group/' + options.group_id + '/toggle-modules/'; case 'group_discussions': return siteRoot + 'api2/groups/' + options.group_id + '/discussions/'; case 'group_discussion': return siteRoot + 'api2/groups/' + options.group_id + '/discussions/' + options.discussion_id + '/';