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

modify api name (#3822)

Browse Source
This commit is contained in:
王健辉
2019-07-08 18:04:56 +08:00
committed by Daniel Pan
parent 53a79ed706
commit 79c7989214
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/search/search.js
View File

@@ -98,7 +98,7 @@ class Search extends Component {
let isPublic = this.props.isPublic; let isPublic = this.props.isPublic;
if (isPublic) { if (isPublic) {
seafileAPI.searchPublicFiles(queryData.q, queryData.search_repo).then(res => { seafileAPI.searchFilesInPublishedRepo(queryData.q, queryData.search_repo).then(res => {
if (!res.data.total) { if (!res.data.total) {
_this.setState({ _this.setState({
resultItems: [], resultItems: [],

16
seahub/api2/endpoints/public_repos_search.py
View File

@@ -21,7 +21,7 @@ if HAS_FILE_SEARCH:
logger = logging.getLogger('seafes') logger = logging.getLogger('seafes')
class PublicReposSearchView(APIView): class PublishedRepoSearchView(APIView):
""" Search public repos """ Search public repos
""" """
authentication_classes = (TokenAuthentication, SessionAuthentication) authentication_classes = (TokenAuthentication, SessionAuthentication)
@@ -40,19 +40,19 @@ class PublicReposSearchView(APIView):
error_msg = 'q invalid.' error_msg = 'q invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
search_repo = request.GET.get('search_repo', None) repo_id = request.GET.get('repo_id', None)
if not is_valid_repo_id_format(search_repo): if not is_valid_repo_id_format(repo_id):
error_msg = 'search_repo invalid.' error_msg = 'repo_id invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
# recourse check # recourse check
repo = seafile_api.get_repo(search_repo) repo = seafile_api.get_repo(repo_id)
if not repo: if not repo:
error_msg = 'Library %s not found.' % search_repo error_msg = 'Library %s not found.' % repo_id
return api_error(status.HTTP_404_NOT_FOUND, error_msg) return api_error(status.HTTP_404_NOT_FOUND, error_msg)
# permission check # permission check
wiki = Wiki.objects.filter(repo_id=search_repo)[0] wiki = Wiki.objects.filter(repo_id=repo_id)[0]
if not wiki.has_read_perm(request): if not wiki.has_read_perm(request):
error_msg = 'Permission denied.' error_msg = 'Permission denied.'
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
@@ -73,7 +73,7 @@ class PublicReposSearchView(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
repo_id_map = {} repo_id_map = {}
map_id = repo.origin_repo_id if repo.origin_repo_id else search_repo map_id = repo.origin_repo_id if repo.origin_repo_id else repo_id
repo_id_map[map_id] = repo repo_id_map[map_id] = repo
# search file # search file
try: try:

4
seahub/urls.py
View File

@@ -89,7 +89,7 @@ from seahub.api2.endpoints.related_files import RelatedFilesView, RelatedFileVie
from seahub.api2.endpoints.webdav_secret import WebdavSecretView from seahub.api2.endpoints.webdav_secret import WebdavSecretView
from seahub.api2.endpoints.starred_items import StarredItems from seahub.api2.endpoints.starred_items import StarredItems
from seahub.api2.endpoints.markdown_lint import MarkdownLintView from seahub.api2.endpoints.markdown_lint import MarkdownLintView
from seahub.api2.endpoints.public_repos_search import PublicReposSearchView from seahub.api2.endpoints.public_repos_search import PublishedRepoSearchView
# Admin # Admin
from seahub.api2.endpoints.admin.revision_tag import AdminTaggedItemsView from seahub.api2.endpoints.admin.revision_tag import AdminTaggedItemsView
@@ -361,7 +361,7 @@ urlpatterns = [
url(r'^api/v2.1/markdown-lint/$', MarkdownLintView.as_view(), name='api-v2.1-markdown-lint'), url(r'^api/v2.1/markdown-lint/$', MarkdownLintView.as_view(), name='api-v2.1-markdown-lint'),
# public repos search # public repos search
url(r'^api/v2.1/public-repos-search/$', PublicReposSearchView.as_view(), name='api-v2.1-public-repos-search'), url(r'^api/v2.1/published-repo-search/$', PublishedRepoSearchView.as_view(), name='api-v2.1-published-repo-search'),
# Deprecated # Deprecated
url(r'^api/v2.1/repos/(?P<repo_id>[-0-9a-f]{36})/tags/$', FileTagsView.as_view(), name="api-v2.1-filetags-view"), url(r'^api/v2.1/repos/(?P<repo_id>[-0-9a-f]{36})/tags/$', FileTagsView.as_view(), name="api-v2.1-filetags-view"),