diff --git a/organizations/urls.py b/organizations/urls.py index 999f06041c..58f98dd0f0 100644 --- a/organizations/urls.py +++ b/organizations/urls.py @@ -1,8 +1,7 @@ from django.conf.urls.defaults import * from views import * -from seahub.views import repo, repo_history, org_seafadmin, \ - org_group_admin +from seahub.views import repo, repo_history urlpatterns = patterns('', url(r'^create/$', create_org, name='create_org'), diff --git a/organizations/views.py b/organizations/views.py index 5eb0941815..a07da96055 100644 --- a/organizations/views.py +++ b/organizations/views.py @@ -271,3 +271,71 @@ def org_repo_create(request, url_prefix): else: return HttpResponseBadRequest(json.dumps(form.errors), content_type=content_type) + +@login_required +def org_seafadmin(request, url_prefix): + if not request.user.org: + raise Http404 + + # Make sure page request is an int. If not, deliver first page. + try: + current_page = int(request.GET.get('page', '1')) + per_page= int(request.GET.get('per_page', '25')) + except ValueError: + current_page = 1 + per_page = 25 + + repos_all = get_org_repos(request.user.org['org_id'], + per_page * (current_page -1), + per_page + 1) + + repos = repos_all[:per_page] + + if len(repos_all) == per_page + 1: + page_next = True + else: + page_next = False + + return render_to_response( + 'organizations/org_seafadmin.html', { + 'repos': repos, + 'current_page': current_page, + 'prev_page': current_page-1, + 'next_page': current_page+1, + 'per_page': per_page, + 'page_next': page_next, + }, + context_instance=RequestContext(request)) + +def org_group_admin(request, url_prefix): + if not request.user.org['is_staff']: + raise Http404 + + # Make sure page request is an int. If not, deliver first page. + try: + current_page = int(request.GET.get('page', '1')) + per_page= int(request.GET.get('per_page', '25')) + except ValueError: + current_page = 1 + per_page = 25 + + groups_plus_one = get_org_groups (request.user.org['org_id'], + per_page * (current_page -1), + per_page +1) + + groups = groups_plus_one[:per_page] + + if len(groups_plus_one) == per_page + 1: + page_next = True + else: + page_next = False + + return render_to_response('organizations/org_group_admin.html', { + 'groups': groups, + 'current_page': current_page, + 'prev_page': current_page-1, + 'next_page': current_page+1, + 'per_page': per_page, + 'page_next': page_next, + }, context_instance=RequestContext(request)) + diff --git a/templates/org_group_admin.html b/templates/org_group_admin.html deleted file mode 100644 index b838753bf7..0000000000 --- a/templates/org_group_admin.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "org_admin_base.html" %} -{% load seahub_tags %} - -{% block nav_groupadmin_class %}class="cur"{% endblock %} - -{% block right_panel %} -

所有小组

-{% if groups %} - - - - - - - - {% for group in groups %} - - - - - - - {% endfor %} -
名字创建者创建时间操作
{{ group.props.group_name }}{{ group.props.creator_name }}{{ group.props.timestamp|tsstr_sec }}
- -
- {% if current_page != 1 %} - 上一页 - {% endif %} - {% if page_next %} - 下一页 - {% endif %} - 每页： - {% if per_page == 25 %} - 25 - {% else %} - 25 - {% endif %} - {% if per_page == 50 %} - 50 - {% else %} - 50 - {% endif %} - {% if per_page == 100 %} - 100 - {% else %} - 100 - {% endif %} -
-{% else %} -

暂无

-{% endif %} -{% endblock %} - -{% block extra_script %} - -{% endblock %} - diff --git a/templates/org_seafadmin.html b/templates/org_seafadmin.html deleted file mode 100644 index 546ddbb238..0000000000 --- a/templates/org_seafadmin.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends base_template %} -{% block nav_seafadmin_class %}class="cur"{% endblock %} - -{% block right_panel %} -

所有同步目录

-{% if repos %} - - - - - - - - {% for repo in repos %} - - - - - - - {% endfor %} -
名字拥有者描述操作
{{ repo.props.name }}{{ repo.owner}}{{ repo.props.desc }}
- -
- {% if current_page != 1 %} - 上一页 - {% endif %} - {% if page_next %} - 下一页 - {% endif %} - 每页： - {% if per_page == 25 %} - 25 - {% else %} - 25 - {% endif %} - {% if per_page == 50 %} - 50 - {% else %} - 50 - {% endif %} - {% if per_page == 100 %} - 100 - {% else %} - 100 - {% endif %} -
-{% else %} -

暂无

-{% endif %} -{% endblock %} - -{% block extra_script %} - -{% endblock %} - diff --git a/urls.py b/urls.py index 4f93abd40a..41e5dc4e3e 100644 --- a/urls.py +++ b/urls.py @@ -4,9 +4,8 @@ from django.views.generic.simple import direct_to_template from seahub.views import root, myhome, \ repo, repo_history, modify_token, remove_repo, sys_seafadmin, sys_useradmin, \ - org_seafadmin, org_group_admin, org_remove, \ activate_user, user_add, user_remove, sys_group_admin, sys_org_admin, \ - ownerhome, repo_history_revert, repo_file_get, \ + ownerhome, repo_history_revert, repo_file_get, org_remove, \ user_info, repo_set_access_property, repo_access_file, \ repo_remove_share, repo_download, org_info, repo_view_file, pdf_full_view, \ seafile_access_check, back_local, repo_history_changes, \ diff --git a/views.py b/views.py index 1dffad3fbf..cf7812498c 100644 --- a/views.py +++ b/views.py @@ -1143,47 +1143,6 @@ def sys_seafadmin(request): }, context_instance=RequestContext(request)) -@login_required -def org_seafadmin(request, url_prefix): - if not request.user.org: - raise Http404 - - # Make sure page request is an int. If not, deliver first page. - try: - current_page = int(request.GET.get('page', '1')) - per_page= int(request.GET.get('per_page', '25')) - except ValueError: - current_page = 1 - per_page = 25 - - repos_all = seafserv_threaded_rpc.get_org_repo_list(request.user.org['org_id'], - per_page * (current_page -1), - per_page + 1) - - repos = repos_all[:per_page] - - if len(repos_all) == per_page + 1: - page_next = True - else: - page_next = False - - for repo in repos: - try: - repo.owner = seafserv_threaded_rpc.get_repo_owner(repo.props.id) - except: - repo.owner = None - - return render_to_response( - 'org_seafadmin.html', { - 'repos': repos, - 'current_page': current_page, - 'prev_page': current_page-1, - 'next_page': current_page+1, - 'per_page': per_page, - 'page_next': page_next, - }, - context_instance=RequestContext(request)) - @login_required def sys_useradmin(request): if not request.user.is_staff: @@ -1384,38 +1343,6 @@ def sys_org_admin(request): return render_to_response('sys_org_admin.html', { 'orgs': orgs, }, context_instance=RequestContext(request)) - -def org_group_admin(request, url_prefix): - if not request.user.is_staff and not request.user.org['is_staff']: - raise Http404 - - # Make sure page request is an int. If not, deliver first page. - try: - current_page = int(request.GET.get('page', '1')) - per_page= int(request.GET.get('per_page', '25')) - except ValueError: - current_page = 1 - per_page = 25 - - groups_plus_one = ccnet_threaded_rpc.get_org_groups (request.user.org['org_id'], - per_page * (current_page -1), - per_page +1) - - groups = groups_plus_one[:per_page] - - if len(groups_plus_one) == per_page + 1: - page_next = True - else: - page_next = False - - return render_to_response('org_group_admin.html', { - 'groups': groups, - 'current_page': current_page, - 'prev_page': current_page-1, - 'next_page': current_page+1, - 'per_page': per_page, - 'page_next': page_next, - }, context_instance=RequestContext(request)) def org_remove(request, org_id): if not request.user.is_staff: