Skip to content

Commit 677303e

Browse files
committed
fix #388 layer对话框按钮,当全选数据时,点击按钮,获取到的 queryset 只有第一页的数据
1 parent c64f8f4 commit 677303e

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

simpleui/admin.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@ def callback(self, request):
88
post = request.POST
99
action = post.get('_action')
1010
selected = post.get('_selected')
11+
select_across = post.get('select_across')
1112

1213
# call admin
1314
if hasattr(self, action):
1415
func, action, description = self.get_action(action)
1516
# 这里的queryset 会有数据过滤,只包含选中的数据
1617
queryset = self.get_queryset(request)
17-
if selected and selected.split(','):
18-
queryset = queryset.filter(pk__in=selected.split(','))
18+
19+
# 没有选择全部的时候才过滤数据
20+
if select_across == '0':
21+
if selected and selected.split(','):
22+
queryset = queryset.filter(pk__in=selected.split(','))
1923

2024
return func(self, request, queryset)
2125

simpleui/templates/admin/actions.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@
230230
let selecteds = [];
231231
$("#result_list .selected input[name='_selected_action']").each((index, item) => selecteds.push(item.value));
232232
data.append('_selected', selecteds.join(','));
233+
data.append('select_across',document.querySelector("input[name='select_across']").value)
233234
//获取选中的数据
234235

235236
data.append('csrfmiddlewaretoken', document.querySelector('[name="csrfmiddlewaretoken"]').value);

0 commit comments

Comments
 (0)