修复站点只有私密文集的情况下游客可搜索到私密文集文档的问题
This commit is contained in:
parent
ef1f3b4baa
commit
de247b00f0
@ -66,16 +66,26 @@ class DocSearchView(SearchView):
|
||||
view_list = list(set(open_list).union(set(colla_list))) # 合并上述两个文集ID列表
|
||||
else:
|
||||
view_list = [i.id for i in Project.objects.filter(role=0)] # 公开文集
|
||||
|
||||
sqs = SearchQuerySet().filter(
|
||||
top_doc__in=view_list
|
||||
).filter(
|
||||
modify_time__gte=start_date,
|
||||
modify_time__lte=end_date).order_by('-modify_time')
|
||||
self.form = self.build_form(form_kwargs={'searchqueryset':sqs})
|
||||
self.query = self.get_query()
|
||||
self.results = self.get_results()
|
||||
return self.create_response()
|
||||
if len(view_list) > 0:
|
||||
sqs = SearchQuerySet().filter(
|
||||
top_doc__in=view_list
|
||||
).filter(
|
||||
modify_time__gte=start_date,
|
||||
modify_time__lte=end_date).order_by('-modify_time')
|
||||
self.form = self.build_form(form_kwargs={'searchqueryset':sqs})
|
||||
self.query = self.get_query()
|
||||
self.results = self.get_results()
|
||||
return self.create_response()
|
||||
else:
|
||||
sqs = SearchQuerySet().filter(
|
||||
top_doc__in=None
|
||||
).filter(
|
||||
modify_time__gte=start_date,
|
||||
modify_time__lte=end_date).order_by('-modify_time')
|
||||
self.form = self.build_form(form_kwargs={'searchqueryset': sqs})
|
||||
self.query = self.get_query()
|
||||
self.results = self.get_results()
|
||||
return self.create_response()
|
||||
|
||||
def extra_context(self):
|
||||
context = {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user