From 5e5b6525c555a444df2d616543aeae878ae81957 Mon Sep 17 00:00:00 2001 From: Shanks <63188620+Shankschn@users.noreply.github.com> Date: Mon, 14 Jun 2021 23:40:19 +0800 Subject: [PATCH 1/5] Update login.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 单词错误 --- simpleui/templates/admin/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpleui/templates/admin/login.html b/simpleui/templates/admin/login.html index 6e586426..9dc1c29b 100755 --- a/simpleui/templates/admin/login.html +++ b/simpleui/templates/admin/login.html @@ -95,7 +95,7 @@ {% if password_reset_url %}
- {% translate 'Forgotten your password or username?' %} + {% trans 'Forgotten your password or username?' %}
{% endif %}
From 7e7f3f274ef6b0c0a1cee54bf2ec83f878b26aa3 Mon Sep 17 00:00:00 2001 From: newpanjing <599194993@qq.com> Date: Thu, 8 Jul 2021 11:00:27 +0800 Subject: [PATCH 2/5] release 2021.7.8 --- simpleui/__init__.py | 2 +- simpleui/templates/admin/login.html | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/simpleui/__init__.py b/simpleui/__init__.py index d18acb76..cf598092 100644 --- a/simpleui/__init__.py +++ b/simpleui/__init__.py @@ -2,4 +2,4 @@ def get_version(): - return '2021.6.1' + return '2021.7.8' diff --git a/simpleui/templates/admin/login.html b/simpleui/templates/admin/login.html index 6e586426..1132a24c 100755 --- a/simpleui/templates/admin/login.html +++ b/simpleui/templates/admin/login.html @@ -95,7 +95,7 @@ {% if password_reset_url %}
- {% translate 'Forgotten your password or username?' %} + {% trans 'Forgotten your password or username?' %}
{% endif %}
@@ -109,8 +109,9 @@
{% endblock %} {% include 'admin/includes/js-part.html' %} - +{% block login_js %} +{% endblock %} {% block particles %} {% if 'SIMPLEUI_LOGIN_PARTICLES'|get_config != False %} From 677303ee781b19f2dd05217ee8da0d6fd5e2a1da Mon Sep 17 00:00:00 2001 From: newpanjing <599194993@qq.com> Date: Wed, 21 Jul 2021 11:23:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=20#388=20=20layer=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E6=A1=86=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BD=93=E5=85=A8=E9=80=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=88=B0=E7=9A=84=20querys?= =?UTF-8?q?et=20=E5=8F=AA=E6=9C=89=E7=AC=AC=E4=B8=80=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/admin.py | 8 ++++++-- simpleui/templates/admin/actions.html | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/simpleui/admin.py b/simpleui/admin.py index c9787264..a545307d 100644 --- a/simpleui/admin.py +++ b/simpleui/admin.py @@ -8,14 +8,18 @@ def callback(self, request): post = request.POST action = post.get('_action') selected = post.get('_selected') + select_across = post.get('select_across') # call admin if hasattr(self, action): func, action, description = self.get_action(action) # 这里的queryset 会有数据过滤，只包含选中的数据 queryset = self.get_queryset(request) - if selected and selected.split(','): - queryset = queryset.filter(pk__in=selected.split(',')) + + # 没有选择全部的时候才过滤数据 + if select_across == '0': + if selected and selected.split(','): + queryset = queryset.filter(pk__in=selected.split(',')) return func(self, request, queryset) diff --git a/simpleui/templates/admin/actions.html b/simpleui/templates/admin/actions.html index 542fbe0d..d43fe371 100644 --- a/simpleui/templates/admin/actions.html +++ b/simpleui/templates/admin/actions.html @@ -230,6 +230,7 @@ let selecteds = []; $("#result_list .selected input[name='_selected_action']").each((index, item) => selecteds.push(item.value)); data.append('_selected', selecteds.join(',')); + data.append('select_across',document.querySelector("input[name='select_across']").value) //获取选中的数据 data.append('csrfmiddlewaretoken', document.querySelector('[name="csrfmiddlewaretoken"]').value); From d2214d74f5e6f7e656d56eaac879cbdfb7055633 Mon Sep 17 00:00:00 2001 From: newpanjing <599194993@qq.com> Date: Wed, 21 Jul 2021 11:24:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=20#375=20=E5=9C=A8=E7=89=B9=E5=AE=9A?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE=E4=B8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=89=E4=B8=AD=E8=AE=A1=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleui/templates/admin/actions.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simpleui/templates/admin/actions.html b/simpleui/templates/admin/actions.html index d43fe371..142f46b5 100644 --- a/simpleui/templates/admin/actions.html +++ b/simpleui/templates/admin/actions.html @@ -70,8 +70,7 @@ {% blocktrans with cl.result_count as total_count %} - Select all {{ total_count }} {{ module_name }}{% endblocktrans %} + title="{% trans "Click here to select the objects across all pages" %}">{% blocktrans with cl.result_count as total_count %}Select all {{ total_count }} {{ module_name }}{% endblocktrans %} {% trans "Clear selection" %} From 14f55c98e1cbe6404f07cb3c8eb008a671f95c0a Mon Sep 17 00:00:00 2001 From: newpanjing <599194993@qq.com> Date: Wed, 21 Jul 2021 11:25:40 +0800 Subject: [PATCH 5/5] release 2021.8.1 --- simpleui/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpleui/__init__.py b/simpleui/__init__.py index cf598092..9966da7a 100644 --- a/simpleui/__init__.py +++ b/simpleui/__init__.py @@ -2,4 +2,4 @@ def get_version(): - return '2021.7.8' + return '2021.8.1'