From 27c00410d327bda8754b97f0b1042c766251c132 Mon Sep 17 00:00:00 2001 From: syin <704523059@qq.com> Date: Fri, 10 May 2019 11:52:03 +0800 Subject: [PATCH 1/2] add gcc libc-dev linux-headers make autoconf add gcc libc-dev linux-headers make autoconf for pip install -r requirements --- requirements/alpine_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/alpine_requirements.txt b/requirements/alpine_requirements.txt index 687abbee4..3eb144a0d 100644 --- a/requirements/alpine_requirements.txt +++ b/requirements/alpine_requirements.txt @@ -1 +1 @@ -tiff-dev jpeg-dev zlib-dev freetype-dev lcms-dev libwebp-dev tcl-dev tk-dev python3-dev libressl-dev openldap-dev cyrus-sasl-dev krb5-dev sshpass postgresql-dev mariadb-dev sqlite-dev libffi-dev openssh-client +tiff-dev jpeg-dev zlib-dev freetype-dev lcms-dev libwebp-dev tcl-dev tk-dev python3-dev libressl-dev openldap-dev cyrus-sasl-dev krb5-dev sshpass postgresql-dev mariadb-dev sqlite-dev libffi-dev openssh-client gcc libc-dev linux-headers make autoconf From d93305f6a44e5b02a9049d32c8e6b7042e655175 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Mon, 22 Jul 2019 18:53:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Bugfix]=20=E8=A7=A3=E5=86=B3=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E8=AE=BE=E7=BD=AE=E4=B8=8D=E6=88=90=E5=8A=9F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E6=8F=90=E4=BA=A4=E5=89=8D=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=B5=8B=E8=AF=95=E6=8C=89=E9=92=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/settings/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/settings/forms.py b/apps/settings/forms.py index c6f51e646..23bcccb09 100644 --- a/apps/settings/forms.py +++ b/apps/settings/forms.py @@ -40,8 +40,8 @@ class BaseForm(forms.Form): field = self.fields[name] if isinstance(field.widget, forms.PasswordInput) and not value: continue - if value == getattr(settings, name): - continue + # if value == getattr(settings, name): + # continue encrypted = True if isinstance(field, FormEncryptMixin) else False try: