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

update import CLOUD_MODE setting

Browse Source
This commit is contained in:
lian
2016-07-23 14:34:44 +08:00
parent 5c2616ed30
commit bc16591ebc
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -1,7 +1,7 @@
language: python language: python
before_install: before_install:
# build/init/start ccnet-server/seafile-server # build/init/start ccnet-server/seafile-server
- git clone --depth=1 --branch=master git://github.com/haiwen/seafile-test-deploy /tmp/seafile-test-deploy - git clone --depth=1 --branch=5.1 git://github.com/haiwen/seafile-test-deploy /tmp/seafile-test-deploy
- cd /tmp/seafile-test-deploy && ./bootstrap.sh && cd - - cd /tmp/seafile-test-deploy && ./bootstrap.sh && cd -
# install phantomjs # install phantomjs
- ./tests/install-deps.sh - ./tests/install-deps.sh

15
seahub/api2/endpoints/search_user.py
View File

@@ -8,8 +8,6 @@ from rest_framework.permissions import IsAuthenticated
from rest_framework.views import APIView from rest_framework.views import APIView
from rest_framework import status from rest_framework import status
from django.conf import settings
import seaserv import seaserv
from seahub.api2.authentication import TokenAuthentication from seahub.api2.authentication import TokenAuthentication
@@ -23,6 +21,13 @@ from seahub.profile.models import Profile
from seahub.contacts.models import Contact from seahub.contacts.models import Contact
from seahub.avatar.templatetags.avatar_tags import api_avatar_url from seahub.avatar.templatetags.avatar_tags import api_avatar_url
from seahub.settings import ENABLE_GLOBAL_ADDRESSBOOK, \
ENABLE_SEARCH_FROM_LDAP_DIRECTLY
try:
from seahub.settings import CLOUD_MODE
except ImportError:
CLOUD_MODE = False
class SearchUser(APIView): class SearchUser(APIView):
""" Search user from contacts/all users """ Search user from contacts/all users
@@ -51,7 +56,7 @@ class SearchUser(APIView):
users_result = [] users_result = []
username = request.user.username username = request.user.username
if settings.CLOUD_MODE: if CLOUD_MODE:
if is_org_context(request): if is_org_context(request):
url_prefix = request.user.org.url_prefix url_prefix = request.user.org.url_prefix
users = seaserv.get_org_users_by_url_prefix(url_prefix, -1, -1) users = seaserv.get_org_users_by_url_prefix(url_prefix, -1, -1)
@@ -65,7 +70,7 @@ class SearchUser(APIView):
users_from_profile = Profile.objects.filter(Q(user__in=[u.email for u in users]) & users_from_profile = Profile.objects.filter(Q(user__in=[u.email for u in users]) &
(Q(nickname__icontains=q)) | Q(contact_email__icontains=q)).values('user') (Q(nickname__icontains=q)) | Q(contact_email__icontains=q)).values('user')
elif settings.ENABLE_GLOBAL_ADDRESSBOOK: elif ENABLE_GLOBAL_ADDRESSBOOK:
users_from_ccnet = search_user_from_ccnet(q) users_from_ccnet = search_user_from_ccnet(q)
users_from_profile = Profile.objects.filter(Q(contact_email__icontains=q) | users_from_profile = Profile.objects.filter(Q(contact_email__icontains=q) |
Q(nickname__icontains=q)).values('user') Q(nickname__icontains=q)).values('user')
@@ -162,7 +167,7 @@ def search_user_from_ccnet(q):
users.extend(ldap_imported_users) users.extend(ldap_imported_users)
count = len(users) count = len(users)
if count < 10 and settings.ENABLE_SEARCH_FROM_LDAP_DIRECTLY: if count < 10 and ENABLE_SEARCH_FROM_LDAP_DIRECTLY:
all_ldap_users = seaserv.ccnet_threaded_rpc.search_ldapusers(q, 0, 10 - count) all_ldap_users = seaserv.ccnet_threaded_rpc.search_ldapusers(q, 0, 10 - count)
users.extend(all_ldap_users) users.extend(all_ldap_users)