diff --git a/forms.py b/forms.py index 19ea4df019..5d7f4dd89d 100644 --- a/forms.py +++ b/forms.py @@ -215,3 +215,11 @@ class RepoPassowrdForm(forms.Form): else: raise forms.ValidationError(u'未知错误') +class SetUserQuotaForm(forms.Form): + """ + Form for setting user quota. + """ + email = forms.CharField(error_messages={'required': '参数错误'}) + quota = forms.IntegerField(min_value=0, + error_messages={'required': '容量不能为空', + 'min_value': '容量不能小于0'}) diff --git a/organizations/templates/organizations/org_useradmin.html b/organizations/templates/organizations/org_admin.html similarity index 83% rename from organizations/templates/organizations/org_useradmin.html rename to organizations/templates/organizations/org_admin.html index e3cf0519c7..27e2a069ca 100644 --- a/organizations/templates/organizations/org_useradmin.html +++ b/organizations/templates/organizations/org_admin.html @@ -3,18 +3,33 @@ {% block nav_useradmin_class %}class="cur"{% endblock %} +{% block left_panel %} + +
+

团体已用总空间

+

{{ org_quota_usage|filesizeformat }} {% if org_quota > 0 %} / {{ org_quota|filesizeformat }} {% endif %}

+
+ +{% endblock %} + {% block right_panel %} -

所有用户

- +

所有成员

+ - + + {% for user in users %} +
邮箱邮箱已用空间 操作
{{ user.props.email }} + {% if user.quota_usage >= 0 %} + {{ user.quota_usage|filesizeformat }} + {% endif %} + {% if not user.is_self %} 删除 diff --git a/organizations/templates/organizations/personal.html b/organizations/templates/organizations/personal.html index 6938e2b812..81ccd74b2b 100644 --- a/organizations/templates/organizations/personal.html +++ b/organizations/templates/organizations/personal.html @@ -21,6 +21,12 @@ {% endif %} + +
+

我已用的团体空间

+

{{ quota_usage|filesizeformat }}

+
+ {% include "snippets/my_groups.html" %} {% endblock %} diff --git a/organizations/urls.py b/organizations/urls.py index 42af1a9f08..36b8ff0943 100644 --- a/organizations/urls.py +++ b/organizations/urls.py @@ -27,7 +27,7 @@ urlpatterns = patterns('', ### Org admin ### url(r'^(?P[^/]+)/seafadmin/$', org_seafadmin, name='org_seafadmin'), - url(r'^(?P[^/]+)/useradmin/$', org_useradmin, name='org_useradmin'), + url(r'^(?P[^/]+)/orgadmin/$', org_admin, name='org_admin'), url(r'^(?P[^/]+)/useradmin/remove/(?P[^/]+)/$', org_user_remove, name='org_user_remove'), url(r'^(?P[^/]+)/groupadmin/$', org_group_admin, name='org_groupadmin'), url(r'^(?P[^/]+)/group/remove/(?P[\d]+)/$', org_group_remove, name='org_group_remove'), diff --git a/organizations/views.py b/organizations/views.py index 21edb4f08d..55459f3ae3 100644 --- a/organizations/views.py +++ b/organizations/views.py @@ -139,6 +139,8 @@ def org_personal(request, url_prefix): events = get_org_user_events(org.org_id, user) else: events = None + + quota_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org.org_id, user) return render_to_response('organizations/personal.html', { 'owned_repos': owned_repos, @@ -151,6 +153,7 @@ def org_personal(request, url_prefix): 'allow_public_share': True, 'nickname': nickname, 'events': events, + 'quota_usage': quota_usage, }, context_instance=RequestContext(request)) @login_required @@ -281,7 +284,7 @@ def send_org_user_add_mail(request, email, password, org_name): @login_required @org_staff_required -def org_useradmin(request, url_prefix): +def org_admin(request, url_prefix): """ List and add org users. """ @@ -333,17 +336,28 @@ def org_useradmin(request, url_prefix): page_next = True else: page_next = False + + org = get_user_current_org(request.user.username, url_prefix) + if not org: + return HttpResponseRedirect(reverse(myhome)) users = users_plus_one[:per_page] for user in users: if user.props.id == request.user.id: user.is_self = True + try: + user.quota_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org.org_id, user.email) + except: + user.quota_usage = -1 # My contacts contacts = Contact.objects.filter(user_email=request.user.username) + + org_quota_usage = seafserv_threaded_rpc.get_org_quota_usage(org.org_id) + org_quota = seafserv_threaded_rpc.get_org_quota(org.org_id) return render_to_response( - 'organizations/org_useradmin.html', { + 'organizations/org_admin.html', { 'users': users, 'contacts': contacts, 'current_page': current_page, @@ -351,6 +365,8 @@ def org_useradmin(request, url_prefix): 'next_page': current_page+1, 'per_page': per_page, 'page_next': page_next, + 'org_quota_usage': org_quota_usage, + 'org_quota': org_quota, }, context_instance=RequestContext(request)) diff --git a/templates/base.html b/templates/base.html index 746540c959..a0bae322c9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -49,7 +49,7 @@ {% endif %} {% if org.is_staff %} - 管理员工作台 + 管理员工作台 个人工作台 {% endif %} diff --git a/templates/myhome.html b/templates/myhome.html index f0b8fe45b4..152d0216c9 100644 --- a/templates/myhome.html +++ b/templates/myhome.html @@ -42,7 +42,7 @@

已用空间

-

{{ quota_usage|filesizeformat }} {% if cloud_mode %}/ 2 GB {% endif %}

+

{{ quota_usage|filesizeformat }} {% if quota > 0 %}/ {{ quota|filesizeformat }} {% endif %}

diff --git a/templates/org_admin_base.html b/templates/org_admin_base.html index 577fbd6ee3..6d42ee2d14 100644 --- a/templates/org_admin_base.html +++ b/templates/org_admin_base.html @@ -4,7 +4,7 @@
    {% if request.user.org.is_staff %}
  • - 用户管理 + 团体概况
  • 资料库管理 diff --git a/templates/sys_org_admin.html b/templates/sys_org_admin.html index d362a3e5a2..64f048bdfe 100644 --- a/templates/sys_org_admin.html +++ b/templates/sys_org_admin.html @@ -4,7 +4,7 @@ {% block nav_orgadmin_class %}class="cur"{% endblock %} {% block right_panel %} -

    所有企业

    +

    所有团体

    {% if orgs %} @@ -58,7 +58,7 @@ {% block extra_script %} {% endblock %} diff --git a/templates/userinfo.html b/templates/userinfo.html index 02874b667b..5bdeae70b6 100644 --- a/templates/userinfo.html +++ b/templates/userinfo.html @@ -1,5 +1,7 @@ {% extends "admin_base.html" %} +{% load url from future %} + {% block nav_useradmin_class %}class="cur"{% endblock %} {% block left_panel %} -

    已用空间

    -

    {{ quota_usage|filesizeformat }} / 2 GB

    +
    +
    +

    已用空间

    + 设置容量 +
    +

    {{ quota_usage|filesizeformat }} {% if quota > 0 %} / {{ quota|filesizeformat }} {% endif %}

    +
    {% endblock %} @@ -29,7 +36,7 @@ {% endfor %} @@ -61,33 +68,59 @@

    暂无

    {% endif %} - +{% endblock %} + + +{% block extra_script %} + {% endblock %} diff --git a/views.py b/views.py index a26cf1d8d9..0308048066 100644 --- a/views.py +++ b/views.py @@ -60,7 +60,7 @@ from notifications.models import UserNotification from profile.models import Profile from forms import AddUserForm, FileLinkShareForm, RepoCreateForm, \ RepoNewDirForm, RepoNewFileForm, FileCommentForm, RepoRenameFileForm, \ - RepoPassowrdForm, SharedRepoCreateForm + RepoPassowrdForm, SharedRepoCreateForm, SetUserQuotaForm from utils import render_permission_error, render_error, list_to_string, \ get_httpserver_root, get_ccnetapplet_root, gen_token, \ calculate_repo_last_modify, valid_previewed_file, \ @@ -858,6 +858,7 @@ def myhome(request): quota_usage = 0 email = request.user.username + quota = seafserv_threaded_rpc.get_user_quota(email) quota_usage = seafserv_threaded_rpc.get_user_quota_usage(email) # Personal repos that I own @@ -921,6 +922,7 @@ def myhome(request): return render_to_response('myhome.html', { "nickname": nickname, "owned_repos": owned_repos, + "quota": quota, "quota_usage": quota_usage, "in_repos": in_repos, "contacts": contacts, @@ -1825,10 +1827,32 @@ def sys_useradmin(request): @login_required @sys_staff_required def user_info(request, email): + if request.method == 'POST': + result = {} + content_type = 'application/json; charset=utf-8' + + f = SetUserQuotaForm(request.POST) + if f.is_valid(): + email = f.cleaned_data['email'] + quota_mb = f.cleaned_data['quota'] + quota = quota_mb * (1 << 20) + + try: + seafserv_threaded_rpc.set_user_quota(email, quota) + except: + result['error'] = u'内部错误，设置失败' + return HttpResponse(json.dumps(result), content_type=content_type) + + result['success'] = True + return HttpResponse(json.dumps(result), content_type=content_type) + else: + result['error'] = str(f.errors.values()[0]) + return HttpResponse(json.dumps(result), content_type=content_type) + owned_repos = [] - quota_usage = 0 owned_repos = seafserv_threaded_rpc.list_owned_repos(email) + quota = seafserv_threaded_rpc.get_user_quota(email) quota_usage = seafserv_threaded_rpc.get_user_quota_usage(email) # Repos that are share to user @@ -1838,6 +1862,7 @@ def user_info(request, email): return render_to_response( 'userinfo.html', { 'owned_repos': owned_repos, + 'quota': quota, 'quota_usage': quota_usage, "in_repos": in_repos, 'email': email
    {{ repo.props.name }} {{ repo.props.desc }} - + 删除