haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-14 06:11:16 +00:00
Code Issues Releases Wiki Activity

fix file search settings bug (#7354)

Browse Source
This commit is contained in:
JoinTyang
2025-01-13 15:46:25 +08:00
committed by GitHub
parent c21bf10031
commit b0f56adc61
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
seahub/search/utils.py
View File

@@ -14,12 +14,15 @@ from seahub.utils import get_user_repos
from seahub.base.templatetags.seahub_tags import email2nickname, \ from seahub.base.templatetags.seahub_tags import email2nickname, \
email2contact_email email2contact_email
from seahub.constants import REPO_TYPE_WIKI from seahub.constants import REPO_TYPE_WIKI
from seahub.utils import HAS_FILE_SEARCH
import seaserv import seaserv
from seaserv import seafile_api from seaserv import seafile_api
os.environ['EVENTS_CONFIG_FILE'] = EVENTS_CONFIG_FILE os.environ['EVENTS_CONFIG_FILE'] = EVENTS_CONFIG_FILE
from seafes import es_search, es_wiki_search
if HAS_FILE_SEARCH:
from seafes import es_search, es_wiki_search
# Get an instance of a logger # Get an instance of a logger
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
seahub/utils/__init__.py
View File

@@ -1248,6 +1248,8 @@ if EVENTS_CONFIG_FILE:
HAS_FILE_SEARCH = check_search_enabled() HAS_FILE_SEARCH = check_search_enabled()
HAS_FILE_SEASEARCH = check_seasearch_enabled() HAS_FILE_SEASEARCH = check_seasearch_enabled()
if HAS_FILE_SEARCH and HAS_FILE_SEASEARCH:
raise Exception('ES and seasearch cannot be configured simultaneously.')
# repo auto delete related # repo auto delete related
ENABLE_REPO_AUTO_DEL = False ENABLE_REPO_AUTO_DEL = False