Merge pull request #3013 from jumpserver/dev

Dev

Merge pull request #3013 from jumpserver/dev
Dev
00e1bf6c · 老广 · GitHub · 332d75b6 · 9454854f · 00e1bf6c
Unverified Commit 00e1bf6c authored Jul 23, 2019 by 老广 Committed by GitHub Jul 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

forms.py apps/settings/forms.py +2 -2

alpine_requirements.txt requirements/alpine_requirements.txt +1 -1

No files found.
--- 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:

--- a/requirements/alpine_requirements.txt
+++ b/requirements/alpine_requirements.txt
-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