From 59a69f02536d880b57ac72cfab432c6bcdb1e572 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 15 Jan 2018 13:54:19 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dtitle=E6=98=BE?= =?UTF-8?q?=E7=A4=BAJumpserver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/views.py | 9 ++++++--- apps/perms/api.py | 2 +- apps/users/templates/users/login.html | 2 +- apps/users/templates/users/reset_password.html | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/common/views.py b/apps/common/views.py index 9a0a314ec..4135ca82c 100644 --- a/apps/common/views.py +++ b/apps/common/views.py @@ -27,7 +27,8 @@ class BasicSettingView(AdminUserRequiredMixin, TemplateView): form.save() if "AUTH_LDAP" in form.cleaned_data: ldap_auth_enable.send(form.cleaned_data["AUTH_LDAP"]) - messages.success(request, _("Update setting successfully")) + msg = _("Update setting successfully, please restart program") + messages.success(request, msg) return redirect('settings:basic-setting') else: context = self.get_context_data() @@ -52,7 +53,8 @@ class EmailSettingView(AdminUserRequiredMixin, TemplateView): form = self.form_class(request.POST) if form.is_valid(): form.save() - messages.success(request, _("Update setting successfully")) + msg = _("Update setting successfully, please restart program") + messages.success(request, msg) return redirect('settings:email-setting') else: context = self.get_context_data() @@ -77,7 +79,8 @@ class LDAPSettingView(AdminUserRequiredMixin, TemplateView): form = self.form_class(request.POST) if form.is_valid(): form.save() - messages.success(request, _("Update setting successfully")) + msg = _("Update setting successfully, please restart program") + messages.success(request, msg) return redirect('settings:ldap-setting') else: context = self.get_context_data() diff --git a/apps/perms/api.py b/apps/perms/api.py index ee2d12ff8..9165a9098 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -351,7 +351,7 @@ class UserGroupGrantedAssetGroupsApi(ListAPIView): class ValidateUserAssetPermissionView(APIView): - permission_classes = (IsAppUser,) + permission_classes = (IsSuperUserOrAppUser,) @staticmethod def get(request): diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html index e9504d63c..284b6bc43 100644 --- a/apps/users/templates/users/login.html +++ b/apps/users/templates/users/login.html @@ -6,7 +6,7 @@ - JumpServer + Jumpserver {% include '_head_css_js.html' %} diff --git a/apps/users/templates/users/reset_password.html b/apps/users/templates/users/reset_password.html index 6c454ee01..cf8003a86 100644 --- a/apps/users/templates/users/reset_password.html +++ b/apps/users/templates/users/reset_password.html @@ -6,7 +6,7 @@ - JumpServer + Jumpserver {% include '_head_css_js.html' %}