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

update ccnet api usage

Browse Source
This commit is contained in:
lian
2017-03-29 10:28:51 +08:00
parent a3e009fbe0
commit c2140bc3d7
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/api2/authentication.py
View File

@@ -5,7 +5,7 @@ from rest_framework import status
from rest_framework.authentication import BaseAuthentication from rest_framework.authentication import BaseAuthentication
from rest_framework.exceptions import APIException from rest_framework.exceptions import APIException
import seaserv from seaserv import ccnet_api
from seahub.base.accounts import User from seahub.base.accounts import User
from seahub.api2.models import Token, TokenV2 from seahub.api2.models import Token, TokenV2
from seahub.api2.utils import get_client_ip from seahub.api2.utils import get_client_ip
@@ -78,7 +78,7 @@ class TokenAuthentication(BaseAuthentication):
raise AuthenticationFailed('User inactive or deleted') raise AuthenticationFailed('User inactive or deleted')
if MULTI_TENANCY: if MULTI_TENANCY:
orgs = seaserv.get_orgs_by_user(token.user) orgs = ccnet_api.get_orgs_by_user(token.user)
if orgs: if orgs:
user.org = orgs[0] user.org = orgs[0]
@@ -103,7 +103,7 @@ class TokenAuthentication(BaseAuthentication):
raise AuthenticationFailed('User inactive or deleted') raise AuthenticationFailed('User inactive or deleted')
if MULTI_TENANCY: if MULTI_TENANCY:
orgs = seaserv.get_orgs_by_user(token.user) orgs = ccnet_api.get_orgs_by_user(token.user)
if orgs: if orgs:
user.org = orgs[0] user.org = orgs[0]

2
seahub/base/accounts.py
View File

@@ -217,7 +217,7 @@ class User(object):
orgs = [] orgs = []
if is_pro_version(): if is_pro_version():
orgs = ccnet_threaded_rpc.get_orgs_by_user(username) orgs = ccnet_api.get_orgs_by_user(username)
# remove owned repos # remove owned repos
owned_repos = [] owned_repos = []

4
seahub/base/middleware.py
View File

@@ -5,7 +5,7 @@ from django.core.cache import cache
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
import seaserv from seaserv import ccnet_api
from seahub.notifications.models import Notification from seahub.notifications.models import Notification
from seahub.notifications.utils import refresh_cache from seahub.notifications.utils import refresh_cache
@@ -32,7 +32,7 @@ class BaseMiddleware(object):
request.cloud_mode = True request.cloud_mode = True
if MULTI_TENANCY: if MULTI_TENANCY:
orgs = seaserv.get_orgs_by_user(username) orgs = ccnet_api.get_orgs_by_user(username)
if orgs: if orgs:
request.user.org = orgs[0] request.user.org = orgs[0]
else: else:

2
seahub/views/ajax.py
View File

@@ -1368,7 +1368,7 @@ def space_and_traffic(request):
username = request.user.username username = request.user.username
# space & quota calculation # space & quota calculation
org = ccnet_threaded_rpc.get_orgs_by_user(username) org = ccnet_api.get_orgs_by_user(username)
if not org: if not org:
space_quota = seafile_api.get_user_quota(username) space_quota = seafile_api.get_user_quota(username)
space_usage = seafile_api.get_user_self_usage(username) space_usage = seafile_api.get_user_self_usage(username)

8
seahub/views/sysadmin.py
View File

@@ -132,7 +132,7 @@ def _populate_user_quota_usage(user):
Arguments: Arguments:
- `user`: - `user`:
""" """
orgs = ccnet_threaded_rpc.get_orgs_by_user(user.email) orgs = ccnet_api.get_orgs_by_user(user.email)
try: try:
if orgs: if orgs:
user.org = orgs[0] user.org = orgs[0]
@@ -502,7 +502,7 @@ def user_info(request, email):
org_name = None org_name = None
space_quota = space_usage = 0 space_quota = space_usage = 0
org = ccnet_threaded_rpc.get_orgs_by_user(email) org = ccnet_api.get_orgs_by_user(email)
if not org: if not org:
owned_repos = mute_seafile_api.get_owned_repo_list(email, owned_repos = mute_seafile_api.get_owned_repo_list(email,
ret_corrupted=True) ret_corrupted=True)
@@ -646,7 +646,7 @@ def user_set_quota(request, email):
space_quota_mb = f.cleaned_data['space_quota'] space_quota_mb = f.cleaned_data['space_quota']
space_quota = space_quota_mb * get_file_size_unit('MB') space_quota = space_quota_mb * get_file_size_unit('MB')
org = ccnet_threaded_rpc.get_orgs_by_user(email) org = ccnet_api.get_orgs_by_user(email)
try: try:
if not org: if not org:
seafile_api.set_user_quota(email, space_quota) seafile_api.set_user_quota(email, space_quota)
@@ -702,7 +702,7 @@ def user_remove(request, email):
try: try:
user = User.objects.get(email=email) user = User.objects.get(email=email)
org = ccnet_threaded_rpc.get_orgs_by_user(user.email) org = ccnet_api.get_orgs_by_user(user.email)
if org: if org:
if org[0].creator == user.email: if org[0].creator == user.email:
messages.error(request, _(u'Failed to delete: the user is an organization creator')) messages.error(request, _(u'Failed to delete: the user is an organization creator'))